OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
787407e
040fd39
)
Merge branch 'fr/rebase-i-continue-preserve-options'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 16 Dec 2015 22:42:52 +0000
(14:42 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 16 Dec 2015 22:42:52 +0000
(14:42 -0800)
"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
Trivial merge