diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-26 16:20:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 16:20:38 -0800 |
| commit | 289d7e8e148e955d97776feff1a43a249eda86a6 (patch) | |
| tree | 1af6dc01f658cd7e6c8683caff506fd98b3c2908 /config.txt | |
| parent | 4e6ba27c956c6c9b43e7196f210796bd1db478a9 (diff) | |
| download | git-htmldocs-289d7e8e148e955d97776feff1a43a249eda86a6.tar.gz | |
Autogenerated HTML docs for v2.7.0-193-gd10e2
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config.txt b/config.txt index 07f7a3b77..877cbc875 100644 --- a/config.txt +++ b/config.txt @@ -870,6 +870,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + +When the value is `interactive`, the rebase is run in interactive mode. ++ *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details). @@ -1243,6 +1245,10 @@ format.coverLetter:: format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there's more than one patch. +format.outputDirectory:: + Set a custom directory to store the resulting files instead of the + current working directory. + 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 @@ -2157,6 +2163,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + +When the value is `interactive`, the rebase is run in interactive mode. ++ *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details). |