diff options
author | Xiaolong Ye <xiaolong.ye@intel.com> | 2016-04-26 15:51:24 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-26 10:52:57 -0700 |
commit | bb52995f3ec7fac2b282a91af4230e4f387af234 (patch) | |
tree | 42bdf3c3090d6c3481ea44abe712680d97047c2c /Documentation | |
parent | format-patch: introduce --base=auto option (diff) | |
download | tgif-bb52995f3ec7fac2b282a91af4230e4f387af234.tar.xz |
format-patch: introduce format.useAutoBase configuration
This allows to record the base commit automatically, it is equivalent
to set --base=auto in cmdline.
The format.useAutoBase has lower priority than command line option,
so if user set format.useAutoBase and pass the command line option in
the meantime, base_commit will be the one passed to command line
option.
Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-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 2cd6bdd7d2..fb31ae5b3c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1258,6 +1258,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 |