git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-02 10:13:53 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
0ff4bdba32f2f372af8a738ff4e7beefc3c4bfe0
git/git-pull.sh
Junio C Hamano 061219fa7c Merge branch 'en/rebase-against-rebase-fix' into maint 
* en/rebase-against-rebase-fix:
  pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
  t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
2010-09-01 13:43:55 -07:00

8.1 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink