global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 11:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Documentation/gitdiffcore: fix order in pickaxe description
  Documentation: fix minor inconsistency
  Documentation: rebase -i ignores options passed to "git am"
  diff-options: make --patch a synonym for -p
  for-each-ref: Field with abbreviated objectname
  hash_object: correction for zero length file
  gitweb: Use @diff_opts while using format-patch
This commit is contained in:
Junio C Hamano
2010-05-18 22:40:04 -07:00
parent 7d1e8fef7f 636e87d705
commit 3aef81f128
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -2779,7 +2779,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
const char *arg = av[0];
/* Output format options */
if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch"))
options->output_format |= DIFF_FORMAT_PATCH;
else if (opt_arg(arg, 'U', "unified", &options->context))
options->output_format |= DIFF_FORMAT_PATCH;