diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
| commit | 253e772edeb56092e0fad43ec0640658671313c5 (patch) | |
| tree | 8e9278a4ac03353056acd765c04779e01b0ce2f9 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | Unset NO_C99_FORMAT on Cygwin. (diff) | |
| download | tgif-253e772edeb56092e0fad43ec0640658671313c5.tar.xz | |
Merge branch 'maint'
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d2b4a05ca5..d20902bc33 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,6 +341,11 @@ format.headers:: Additional email headers to include in a patch to be submitted by mail. See gitlink:git-format-patch[1]. +format.suffix:: + The default for format-patch is to output files with the suffix + `.patch`. Use this variable to change that suffix (make sure to + include the dot if you want it). + gc.packrefs:: `git gc` does not run `git pack-refs` in a bare repository by default so that older dumb-transport clients can still fetch |