@matheusbsbs / matheus-bagliano / commits / 60571f75ab
Fork 0

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

Junio C Hamano committed Apr 19, 2006 at 16:12 UTC 60571f75ab81f9e1d5a5f351ac07f6d86a461230

No changes.