]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81f9068 75973b2)
Merge branch 'jc/fix-add-u-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:33 +0000 (16:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:33 +0000 (16:37 -0700)
commit90e8b9b23dff20946a0eacdf8abedce7e32c1d78
tree013a475f89cb949c7b448620c9efc009af17b59etree | snapshot
parent81f90684bf879f4e149a2aeb277daf1c38fab16ecommit | diff
parent75973b2cb58bf2b3038c5c214fc0a1b96d6868fecommit | diff
Merge branch 'jc/fix-add-u-unmerged' into maint

* jc/fix-add-u-unmerged:
  Fix "add -u" that sometimes fails to resolve unmerged paths

Conflicts:
builtin/add.c
builtin/add.c diff1 | diff2 | blob | history
t/t2200-add-update.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.