From 44c36d1ccc9a40bfb31910dfd7e18d59fa8be502 Mon Sep 17 00:00:00 2001 From: Charles Bailey Date: Thu, 21 Feb 2008 23:30:02 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/config.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/config.txt') diff --git a/Documentation/config.txt b/Documentation/config.txt index 4027726f2e..514169066d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -777,6 +777,12 @@ mergetool..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. -- cgit v1.2.3