How can I make git log to show cherry-picked commits on the same line? -

-

if run "git log --graph --oneline --branches=* --date-order" on git repository 2 branches , 3 shared commits can this:

* hash9 comment6 * hash8 comment5 * hash7 comment4 | * hash6 comment6 | * hash5 comment5 | * hash4 comment4 | * hash3 comment3 |/ * hash2 comment2 * hash1 comment1

is possible instead this?:

* * hash9 hash6 comment6 * * hash8 hash5 comment5 * * hash7 hash4 comment4 | * hash3 comment3 |/ * hash2 comment2 * hash1 comment1

you have write own graph drawing program. graph drawing code in git log not clever.

your graph drawing program need git cherry or (probably better) lower level cousin git patch-id.

it whether compare commit messages. if do, commit a123456 copy of commit b987654 if message differs? if difference 1 of them says (cherry picked commit ...) , other not? id in string may not match either commit, if both cherry-picked (one -x , 1 without -x) third commit; third commit may no longer in portion of graph drawing, or in repository, if has aged out , been garbage-collected (e.g., due rebase).

what if, branch tip a, find commit sequence:

* a555555 last commit * a444444 fourth commit * a333333 third commit * a222222 second commit * a111111 first commit * a000000 common base

and branch tip b find sequence:

* xxxxxxx second commit * xxxxxxx last commit * xxxxxxx fourth commit * xxxxxxx third commit * xxxxxxx first commit * a000000 common base

how show case? make lot of these sorts of chains when start branch experimental work, , make new version of , rebase more sensible order before reworking specific commits.


Comments

Post a Comment

Popular posts from this blog

wordpress - (T_ENDFOREACH) php error -

-
creating wordpress website , i'm getting following php error: parse error: syntax error, unexpected 'endforeach' (t_endforeach) in /home/soralmedia/public_html/wp-content/themes/soral media/woocommerce/myaccount/my-orders.php on line 98 here's code file: <?php /** * orders * * shows recent orders on account page. * * template can overridden copying yourtheme/woocommerce/myaccount/my-orders.php. * * however, on occasion woocommerce need update template files , (the theme developer). * need copy new files theme maintain compatibility. try this. * little possible, happen. when occurs version of template file will. * bumped , readme list important changes. * * @see http://docs.woothemes.com/document/template-structure/ * @author woothemes * @package woocommerce/templates * @version 2.5.0 */ if ( ! defined( 'abspath' ) ) { exit; } $my_orders_columns = apply_filters( 'woocommerce_my_account_my_orders_columns', array( ...
Read more

Export Excel workseet into txt file using vba - (text and numbers with formulas) -

-
i new vba have developed code use in excel move text/numbers txt file. issue have 3 functions need go same txt file. when run first function has set fs = createobject("scripting.filesystemobject") set = fs.createtextfile(module1.nys45uploadfilename, true) a.writeline (str) a.close. the other 2 functions had save. set fs = createobject("scripting.filesystemobject") set = fs.savetextfile(module1.nys45uploadfilename, true) a.writeline (str) a.close. the first function go txt file, other 2 error object doesn't support property or method. when changed 3 create last function goes txt file. can not figure out word use in order make other 2 functions follow txt file in order keyed. the entire code follows private sub addrecord_click() on error goto errhandler module1.nys45uploadfilename = application.getsaveasfilename(filefilter:="textfiles (*.txt), *.txt") if module1.nys45uploadfilename = "false" exit sub ...
Read more

Using django-mptt to get only the categories that have items -

-
sample structure: all uppercase: category mixed case: item root ├── books │   ├── fiction │   │   └── classics │   └── non-fiction ├── clothing └── electronics ├── laptops ├── phones │   ├── apple │   │   ├── iphone 6 │   │   ├── iphone 6 plus │   │   ├── iphone 6s │   │   └── iphone 6s plus │   ├── motorola │   │   ├── moto g4 │   │   ├── moto g4 play │   │   ├── moto g4 plus │   │   └── moto x │   └── samsung └── tablets └── apple i'm trying have index page show "electronics" category. "clothing" category shouldn't show since it's empty , "books" category shouldn't show either since, although has child categories, child categories don't have items. similarly, "electronics" page should show "phones" category. "laptops" category shouldn't show since it's empty , "tablets" category shouldn't show either since...
Read more