diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:30 -0700 |
| commit | f31613d45afa1e5c87c4a9a964ef9b474ef73932 (patch) | |
| tree | 5359448439bd574c0727e7c21b4e238b197645b6 /Makefile | |
| parent | Merge branch 'jc/diff' into next (diff) | |
| parent | git-update-index --unresolve (diff) | |
| download | tgif-f31613d45afa1e5c87c4a9a964ef9b474ef73932.tar.xz | |
Merge branch 'jc/unresolve' into next
* jc/unresolve:
git-update-index --unresolve
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -165,8 +165,7 @@ 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-unresolve$X + git-describe$X git-merge-tree$X git-blame$X git-imap-send$X BUILT_INS = git-log$X |