]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d26792a db2b3b8)
Merge branch 'af/rebase-i-merge-options'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:58 +0000 (13:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:59 +0000 (13:05 -0700)
commit5b6cd0fe7b876698007c55c577ae2afd49b50c2b
tree88b716b4bbba897e270f507032e4f2e47834da71tree | snapshot
parentd26792ad69c0d2ea0b197656ae9a562e2c1f900ecommit | diff
parentdb2b3b820e2b28da268cc88adff076b396392dfecommit | diff
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--interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.