path: root/Documentation/config.txt
diff options
Diffstat (limited to 'Documentation/config.txt')
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f5152c5..56bd781 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -677,6 +677,16 @@ format.pretty::
See linkgit:git-log[1], linkgit:git-show[1],
+ The default threading style for 'git-format-patch'. Can be
+ either a boolean value, `shallow` or `deep`. 'Shallow'
+ threading makes every mail a reply to the head of the series,
+ where the head is chosen from the cover letter, the
+ `\--in-reply-to`, and the first patch mail, in this order.
+ 'Deep' threading makes every mail a reply to the previous one.
+ A true boolean value is the same as `shallow`, and a false
+ value disables threading.
The window size parameter used in the delta compression
algorithm used by 'git-gc --aggressive'. This defaults
@@ -1160,6 +1170,10 @@ pull.octopus::
The default merge strategy to use when pulling a single branch.
+ Whether to show a diffstat of what changed upstream since the last
+ rebase. False by default.
If it is set to true, git-receive-pack will check all received
objects. It will abort in the case of a malformed object or a