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 /git.c | |
| 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 'git.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -240,7 +240,6 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "diff", cmd_diff, RUN_SETUP | USE_PAGER }, { "diff-files", cmd_diff_files, RUN_SETUP }, { "diff-index", cmd_diff_index, RUN_SETUP }, - { "diff-stages", cmd_diff_stages, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, { "for-each-ref", cmd_for_each_ref, RUN_SETUP }, |