Junio C Hamano 9a159a51a8 Merge branch 'aw/maint-rebase-i-p-no-ff' into next ...

* aw/maint-rebase-i-p-no-ff:
  git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff

Conflicts:
	git-rebase--interactive.sh

2011-05-02 16:16:26 -07:00

21 KiB

Raw Blame History

View Raw