git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc67ad8 c192f9c)
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
authorJunio C Hamano <redacted>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
committerJunio C Hamano <redacted>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
* aw/maint-rebase-i-p-no-ff:
  git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff


Trivial merge
git clone https://git.99rst.org/PROJECT