diff options
| author | Charles Bailey <charles@hashpling.org> | 2008-02-21 23:30:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-05 12:07:03 -0800 |
| commit | 44c36d1ccc9a40bfb31910dfd7e18d59fa8be502 (patch) | |
| tree | 93467c94b6787d69537d9e9122483cc3e817dc61 /Documentation | |
| parent | 79b1138e7894ea048008f6b99908f5cd36e94949 (diff) | |
| download | git-44c36d1ccc9a40bfb31910dfd7e18d59fa8be502.tar.gz git-44c36d1ccc9a40bfb31910dfd7e18d59fa8be502.tar.xz | |
Tidy up git mergetool's backup file behaviour
Currently a backup pre-merge file with conflict markers is sometimes
kept with a .orig extenstion and sometimes removed depending on the
particular merge tool used.
This patch makes the handling consistent across all merge tools and
configurable via a new mergetool.keepBackup config variable
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4027726f2..514169066 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -777,6 +777,12 @@ mergetool.<tool>.path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. +mergetool.keepBackup:: + After performing a merge, the original file with conflict markers + can be saved as a file with a `.orig` extension. If this variable + is set to `false` then this file is not preserved. Defaults to + `true` (i.e. keep the backup files). + pack.window:: The size of the window used by linkgit:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. |