diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:50 -0800 |
| commit | be95387af2820b039d81d121ac2a74fdf9238073 (patch) | |
| tree | db9e2f31602be444238bb0da7ed2ee89cb3c6d13 /submodule.h | |
| parent | Merge branch 'nd/maint-compat-fnmatch-fix' (diff) | |
| parent | submodule: display summary header in bold (diff) | |
| download | tgif-be95387af2820b039d81d121ac2a74fdf9238073.tar.xz | |
Merge branch 'rr/submodule-diff-config'
Allow "git diff --submodule=log" to set to be the default via
configuration.
* rr/submodule-diff-config:
submodule: display summary header in bold
diff: rename "set" variable
diff: introduce diff.submodule configuration variable
Documentation: move diff.wordRegex from config.txt to diff-config.txt
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index f2e8271fc6..3dc1b3fe89 100644 --- a/submodule.h +++ b/submodule.h @@ -20,7 +20,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); void show_submodule_summary(FILE *f, const char *path, unsigned char one[20], unsigned char two[20], - unsigned dirty_submodule, + unsigned dirty_submodule, const char *meta, const char *del, const char *add, const char *reset); void set_config_fetch_recurse_submodules(int value); void check_for_new_submodule_commits(unsigned char new_sha1[20]); |