diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:31 -0700 |
| commit | 72ce3ff7b51c1e0703f433fb000519521441abf8 (patch) | |
| tree | 84a81f6bd529fe6d4236eabf9dca5e78b4cba07e /Documentation/config.txt | |
| parent | Merge branch 'tb/core-eol-fix' (diff) | |
| parent | format-patch: introduce format.useAutoBase configuration (diff) | |
| download | tgif-72ce3ff7b51c1e0703f433fb000519521441abf8.tar.xz | |
Merge branch 'xy/format-patch-base'
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* xy/format-patch-base:
format-patch: introduce format.useAutoBase configuration
format-patch: introduce --base=auto option
format-patch: add '--base' option to record base tree info
patch-ids: make commit_patch_id() a public helper function
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 54253d1635..ea928a729f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1290,6 +1290,10 @@ format.outputDirectory:: Set a custom directory to store the resulting files instead of the current working directory. +format.useAutoBase:: + A boolean value which lets you enable the `--base=auto` option of + format-patch by default. + filter.<driver>.clean:: The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for |