diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:44:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:45:40 -0800 |
| commit | f8f2aaa17297d6b21c84641edc2f6135575a003c (patch) | |
| tree | 48158676defa9aa697d154c9490069a37f749fde /Makefile | |
| parent | 6132bd5cac91c2a42d67f92fd2e266678c6c8474 (diff) | |
| parent | 4cc41a16c15a6d73b13f9211eb8bf49ec869705f (diff) | |
| download | git-f8f2aaa17297d6b21c84641edc2f6135575a003c.tar.gz git-f8f2aaa17297d6b21c84641edc2f6135575a003c.tar.xz | |
Merge branch 'jc/deprecate'
As previously announced, diff-stages and resolve are now gone.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -172,7 +172,7 @@ SCRIPT_SH = \ git-merge-one-file.sh git-parse-remote.sh \ git-pull.sh git-rebase.sh \ git-repack.sh git-request-pull.sh git-reset.sh \ - git-resolve.sh git-revert.sh git-sh-setup.sh \ + git-revert.sh git-sh-setup.sh \ git-tag.sh git-verify-tag.sh \ git-applymbox.sh git-applypatch.sh git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ @@ -280,7 +280,6 @@ BUILTIN_OBJS = \ builtin-diff.o \ builtin-diff-files.o \ builtin-diff-index.o \ - builtin-diff-stages.o \ builtin-diff-tree.o \ builtin-fmt-merge-msg.o \ builtin-for-each-ref.o \ |