Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 13 May 2011 17:45:21 +0000
(10:45 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
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
raw
|
combined
(merge:
bc67ad8
c192f9c
)
Trivial merge