Merge branch 'jc/unresolve' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 19 Apr 2006 23:12:57 +0000 (16:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 19 Apr 2006 23:12:57 +0000 (16:12 -0700)
* jc/unresolve:
Add git-unresolve <paths>...
get_tree_entry(): make it available from tree-walk
sha1_name.c: no need to include diff.h; tree-walk.h will do.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
diff: move diff.c to diff-lib.c to make room.
git log: don't do merge diffs by default
Allow "git repack" users to specify repacking window/depth

1  2 
.gitignore
Makefile
git.c
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc git.c
Simple merge