Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] allow merging any committish
[gitweb.git]
/
diff-index.c
diff --git
a/diff-index.c
b/diff-index.c
index c9a9f4c74d96ea22b2a6c4c7593bccc3d5396457..0054883a5e18aaacc682bb8369c6f0376cf75306 100644
(file)
--- a/
diff-index.c
+++ b/
diff-index.c
@@
-180,7
+180,7
@@
int main(int argc, const char **argv)
int allow_options = 1;
int i;
- git_config(git_d
efault
_config);
+ git_config(git_d
iff
_config);
diff_setup(&diff_options);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];