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 /builtin.h | |
| parent | e33b1dfe2834ceca1c449ec653dea636ca2d0200 (diff) | |
| parent | a4a6e4ab32648631204398691f4066719dea1029 (diff) | |
| download | git-4cc0b8a41b25356ad89f13ec2735756e5dada02a.tar.gz git-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 'builtin.h')
| -rw-r--r-- | builtin.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -19,9 +19,10 @@ extern int cmd_version(int argc, const char **argv, char **envp); extern int cmd_whatchanged(int argc, const char **argv, char **envp); extern int cmd_show(int argc, const char **argv, char **envp); extern int cmd_log(int argc, const char **argv, char **envp); +extern int cmd_diff(int argc, const char **argv, char **envp); extern int cmd_format_patch(int argc, const char **argv, char **envp); extern int cmd_count_objects(int argc, const char **argv, char **envp); -extern int cmd_diff(int argc, const char **argv, char **envp); + extern int cmd_push(int argc, const char **argv, char **envp); extern int cmd_grep(int argc, const char **argv, char **envp); |