| commit | b345b77b3a10dc94c2130669ce27bf61eddaabee | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:33 +0000 (18 12:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:33 +0000 (18 12:20 -0700) | ||
| tree | a56cd02df9e9473611617cb2a4646975478932a0 | treesnapshot (tar.gz zip) |
| parent | 676c7e50b10f1fbb2ce06e46260f15f3a20679f7 | commitdiff |
| parent | d7f590be8409363afad51519d3060188d33fb775 | commitdiff |
Merge branch 'en/rebase-i-microfixes'
* en/rebase-i-microfixes:
git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Fix use of strategy options with interactive rebases
t3418: add testcase showing problems with rebase -i and strategy options
* en/rebase-i-microfixes:
git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Fix use of strategy options with interactive rebases
t3418: add testcase showing problems with rebase -i and strategy options
| git-rebase--merge.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |
| t/t3418-rebase-continue.sh | diff1 | diff2 | blobhistory |