diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-24 02:10:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-24 02:10:55 -0800 |
| commit | 9def2138a17325c68961c3b1e6c967d33f28a4f1 (patch) | |
| tree | ace1cf9adca0334eade813cd1b41acf8422f7efc /git.c | |
| parent | 9e83266525aad5c6210b9a21be9b1c6996d5544f (diff) | |
| parent | 658f3650273abd6888c964b9fb1291c603306df8 (diff) | |
| download | git-9def2138a17325c68961c3b1e6c967d33f28a4f1.tar.gz git-9def2138a17325c68961c3b1e6c967d33f28a4f1.tar.xz | |
Merge branch 'js/rerere'
* js/rerere:
Make git-rerere a builtin
Add a test for git-rerere
move read_mmfile() into xdiff-interface
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -247,6 +247,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "push", cmd_push, RUN_SETUP }, { "read-tree", cmd_read_tree, RUN_SETUP }, { "repo-config", cmd_repo_config }, + { "rerere", cmd_rerere, RUN_SETUP }, { "rev-list", cmd_rev_list, RUN_SETUP }, { "rev-parse", cmd_rev_parse, RUN_SETUP }, { "rm", cmd_rm, RUN_SETUP }, |