diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-04 00:14:56 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-04 00:14:56 -0700 |
commit | 4cc0b8a41b25356ad89f13ec2735756e5dada02a (patch) | |
tree | ac0ac1d6997364a99537b833355ec9b908868ff4 /git.c | |
parent | Merge branch 'master' into next (diff) | |
parent | Add a conversion tool to migrate remote information into the config (diff) | |
download | tgif-4cc0b8a41b25356ad89f13ec2735756e5dada02a.tar.xz |
Merge branch 'js/fetchconfig' into next
* js/fetchconfig:
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Add a few more words to the glossary.
Added definitions for a few words:
Alphabetize the glossary.
sha1_to_hex() usage cleanup
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -46,10 +46,10 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "log", cmd_log }, { "whatchanged", cmd_whatchanged }, { "show", cmd_show }, + { "push", cmd_push }, { "fmt-patch", cmd_format_patch }, { "count-objects", cmd_count_objects }, { "diff", cmd_diff }, - { "push", cmd_push }, { "grep", cmd_grep }, }; int i; |