diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-16 22:42:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-16 22:42:52 (GMT) |
| commit | f3adf457e046f92f039353762a78dcb3afb2cb13 (patch) | |
| tree | d88cafeeb77655862fd61def3256ce5eca2cb3b8 /gitk-git | |
| parent | 787407e5e05ef5cc8bcf15ccae01cd34bfd90573 (diff) | |
| parent | 040fd39e672fce2b549b842895ceb4f5063026f3 (diff) | |
| download | git-f3adf457e046f92f039353762a78dcb3afb2cb13.zip git-f3adf457e046f92f039353762a78dcb3afb2cb13.tar.gz git-f3adf457e046f92f039353762a78dcb3afb2cb13.tar.bz2 | |
Merge branch 'fr/rebase-i-continue-preserve-options'
"git rebase -i" started with merge strategy options did not
propagate them upon "git rebase --continue".
* fr/rebase-i-continue-preserve-options:
rebase -i: remember merge options beyond continue actions
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions