![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 23:12:57 +0000 (16:12 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 23:12:57 +0000 (16:12 -0700) | ||
| commit | 60571f75ab81f9e1d5a5f351ac07f6d86a461230 | |
| tree | eeae35ba6480dcd50b9d02abb70eedd09ba95937 | tree | snapshot |
| parent | 2c4a03290ba3395b4006d8ff5d1f2fa8f23584fa | commit | diff |
| parent | ec167793d84ba7b765e1eb71b0257ce7baca2d26 | commit | diff |
Merge branch 'jc/unresolve' into next
* 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
* 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
| .gitignore | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| git.c | diff1 | | diff2 | | blob | history |