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-diff.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 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index b6114ce948..636edbf2a7 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -271,7 +271,7 @@ int cmd_diff(int argc, const char **argv, char **envp) * * Other cases are errors. */ - + git_config(git_diff_config); init_revisions(&rev); rev.diffopt.output_format = DIFF_FORMAT_PATCH; @@ -321,7 +321,7 @@ int cmd_diff(int argc, const char **argv, char **envp) blob[blobs].name = name; blobs++; continue; - + } die("unhandled object '%s' given.", name); } |