global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-16 13:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
2caa321503cbb6dfd3867d5befe615ae541a77b3
git/git-pull.sh
Junio C Hamano d25c72f7da Merge branch 'en/rebase-against-rebase-fix' 
* 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-08-21 23:27:29 -07:00

8.1 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink