From 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 2 Jul 2007 22:52:14 -0700 Subject: Rewrite "git-frotz" to "git frotz" This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-merge-resolve.sh') diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 75e1de49ac..bb19da2cc1 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -37,10 +37,10 @@ then exit 2 fi -git-update-index --refresh 2>/dev/null -git-read-tree -u -m --aggressive $bases $head $remotes || exit 2 +git update-index --refresh 2>/dev/null +git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." -if result_tree=$(git-write-tree 2>/dev/null) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else -- cgit v1.2.3 From 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a Mon Sep 17 00:00:00 2001 From: Tom Clarke Date: Thu, 30 Aug 2007 23:12:44 +0200 Subject: Fixing comment in merge strategies Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-merge-resolve.sh') diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index bb19da2cc1..93bcfc2f5d 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -25,7 +25,7 @@ do esac done -# Give up if we are given more than two remotes -- not handling octopus. +# Give up if we are given two or more remotes -- not handling octopus. case "$remotes" in ?*' '?*) exit 2 ;; -- cgit v1.2.3 From 7bd93c1c625ce5fa03f0d13d728f34f8ab868991 Mon Sep 17 00:00:00 2001 From: Dan Loewenherz Date: Wed, 22 Apr 2009 21:46:02 -0400 Subject: Convert to use quiet option when available A minor fix that eliminates usage of "2>/dev/null" when --quiet or -q has already been implemented. Signed-off-by: Dan Loewenherz Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-merge-resolve.sh') diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 93bcfc2f5d..c9da747fcf 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -37,10 +37,10 @@ then exit 2 fi -git update-index --refresh 2>/dev/null +git update-index -q --refresh git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." -if result_tree=$(git write-tree 2>/dev/null) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else -- cgit v1.2.3