global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d3218d07d2e09bfd5930debe98e611cf7f8ace1a
git/git-pull.sh
Junio C Hamano 1dea7b938e Merge branch 'en/rebase-against-rebase-fix' into next 
* 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-14 14:59:21 -07:00

8.1 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink