From 8ada0c241b12f1c1a137a6839ad14da69ed1f533 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Aug 2013 18:21:43 +1000 Subject: [PATCH] man page: update instructions for git usage. Signed-off-by: NeilBrown --- wiggle.1 | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/wiggle.1 b/wiggle.1 index 747d4bc..6951d30 100644 --- a/wiggle.1 +++ b/wiggle.1 @@ -634,8 +634,8 @@ browsed to examine each patch in detail. .I wiggle can be integrated with .I git -so that it is used as the default merge tool. This can be achieved by -adding the following lines to +so that it is used as the default merge tool and diff tool. +This can be achieved by adding the following lines to .B .gitconfig in the user's home directory. @@ -643,21 +643,35 @@ in the user's home directory. .nf [merge "wiggle"] name = "Wiggle flexible merging" - driver = /usr/bin/wiggle \-\-report\-wiggles \-r %A %O %B + driver = wiggle \-o %A %A %O %B recursive = binary [merge] tool = wiggle [mergetool "wiggle"] - path = /usr/bin/wiggle cmd = wiggle \-B \-o $MERGED $LOCAL $BASE $REMOTE +[difftool "wiggle"] + cmd = wiggle \-Bd $LOCAL $REMOTE .fi .RE -and then adding +This will make +.B "git mergetool" +and +.B "git difftool" +use +.IR wiggle . + +If you want +.I git +to always use +.I wiggle +for merges (which may be dangerous), you can add .RS 4 * merge=wiggle .RE -to +to an appropriate +.I gitattributes +file such as .BR $HOME/.config/git/attributes . -- 2.39.5