diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /git.c | |
parent | b9d301bca767c9c26b8514fb326dd237cb269fbb (diff) | |
parent | e96fd30553bb57a76ad38f703a3fea5b53c45ff9 (diff) | |
download | git-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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |