diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-19 16:12:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 16:12:57 -0700 |
| commit | 60571f75ab81f9e1d5a5f351ac07f6d86a461230 (patch) | |
| tree | eeae35ba6480dcd50b9d02abb70eedd09ba95937 /Makefile | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Add git-unresolve <paths>... (diff) | |
| download | tgif-60571f75ab81f9e1d5a5f351ac07f6d86a461230.tar.xz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -165,7 +165,8 @@ PROGRAMS = \ git-upload-pack$X git-verify-pack$X git-write-tree$X \ git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \ git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \ - git-describe$X git-merge-tree$X git-blame$X git-imap-send$X + git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \ + git-unresolve$X BUILT_INS = git-log$X @@ -199,7 +200,7 @@ LIB_H = \ tree-walk.h log-tree.h DIFF_OBJS = \ - diff.o diffcore-break.o diffcore-order.o \ + diff-lib.o diffcore-break.o diffcore-order.o \ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ diffcore-delta.o log-tree.o |