diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:59 -0700 |
| commit | 5b6cd0fe7b876698007c55c577ae2afd49b50c2b (patch) | |
| tree | 88b716b4bbba897e270f507032e4f2e47834da71 /t/t0000-basic.sh | |
| parent | d26792ad69c0d2ea0b197656ae9a562e2c1f900e (diff) | |
| parent | db2b3b820e2b28da268cc88adff076b396392dfe (diff) | |
| download | git-5b6cd0fe7b876698007c55c577ae2afd49b50c2b.tar.gz | |
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
Diffstat (limited to 't/t0000-basic.sh')
0 files changed, 0 insertions, 0 deletions