Andrew's git / gitweb.git / diff
?
Merge branch 'jc/unresolve' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700)
* jc/unresolve:
git-update-index --unresolve

1  2 
.gitignore patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge