git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 02:27:35 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
688f4f2fbc353887dbe77c450aaad2ccfd13e8fc
git/git-rebase--interactive.sh
Junio C Hamano 9fdc1cc872 Merge branch 'aw/maint-rebase-i-p-no-ff' 
* 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-06 10:50:00 -07:00

21 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink