]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 226d06c 93ce190)
Merge branch 'ml/rebase-x-strategy'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:29:47 +0000 (12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:29:47 +0000 (12:29 -0700)
* ml/rebase-x-strategy:
  rebase: support -X to pass through strategy options

1  2 
git-rebase.sh patch | diff1 | diff2 | blob | history

diff --cc git-rebase.sh
Simple merge
local clone of git.git