| commit | 5b6cd0fe7b876698007c55c577ae2afd49b50c2b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:05:58 +0000 (11 13:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:05:59 +0000 (11 13:05 -0700) | ||
| tree | 88b716b4bbba897e270f507032e4f2e47834da71 | treesnapshot (tar.gz zip) |
| parent | d26792ad69c0d2ea0b197656ae9a562e2c1f900e | commitdiff |
| parent | db2b3b820e2b28da268cc88adff076b396392dfe | commitdiff |
Merge branch 'af/rebase-i-merge-options'
"git rebase -i" now honors --strategy and -X options.
* af/rebase-i-merge-options:
Do not ignore merge options in interactive rebase
"git rebase -i" now honors --strategy and -X options.
* af/rebase-i-merge-options:
Do not ignore merge options in interactive rebase
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |