aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
commitf63237a18e951b93ac46a0e594f286255e1eaaaf (patch)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615 /git.c
parentb9d301bca767c9c26b8514fb326dd237cb269fbb (diff)
parente96fd30553bb57a76ad38f703a3fea5b53c45ff9 (diff)
downloadgit-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.gz
git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz
Merge branch 'vb/sendemail' into next
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
Diffstat (limited to 'git.c')
-rw-r--r--git.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/git.c b/git.c
index 10ea934bc..bc463c98e 100644
--- a/git.c
+++ b/git.c
@@ -69,7 +69,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "diff-index", cmd_diff_index },
{ "diff-stages", cmd_diff_stages },
{ "diff-tree", cmd_diff_tree },
- { "cat-file", cmd_cat_file }
+ { "cat-file", cmd_cat_file },
+ { "rev-parse", cmd_rev_parse }
};
int i;