]> git.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc2ed04 b4dc085)
Merge branch 'jk/pull-into-dirty-unborn'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:52 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:52 +0000 (14:29 -0700)
"git pull" into nothing trashed "local changes" that were in the
index, and this avoids it.

* jk/pull-into-dirty-unborn:
  pull: merge into unborn by fast-forwarding from empty tree
  pull: update unborn branch tip after index

1  2 
git-pull.sh patch | diff1 | diff2 | blob | history
t/t5520-pull.sh patch | diff1 | diff2 | blob | history

diff --cc git-pull.sh
Simple merge
diff --cc t/t5520-pull.sh
Simple merge
mirror of git://git.kernel.org/pub/scm/git/git.git