diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-20 07:48:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-20 09:38:02 +0400 |
| commit | 88e7fdf2cb436e068434241b0519577293055c19 (patch) | |
| tree | 92fc7121ea594d0830c70a5e05f887cc4f1a2340 /Documentation/config.txt | |
| parent | 163b95919428cd7d782af91296e0b886683f2daa (diff) | |
Document gitattributes(5)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7e41ca6a0d..a130846883 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -499,6 +499,19 @@ merge.verbosity:: conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. +merge.<driver>.name:: + Defines a human readable name for a custom low-level + merge driver. See gitlink:gitattributes[5] for details. + +merge.<driver>.driver:: + Defines the command that implements a custom low-level + merge driver. See gitlink:gitattributes[5] for details. + +merge.<driver>.recursive:: + Names a low-level merge driver to be used when + performing an internal merge between common ancestors. + See gitlink:gitattributes[5] for details. + pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. |