From 3fb005e1005be3b4f0edd97fd2bba086264d5942 Mon Sep 17 00:00:00 2001
From: stuyvenberg <stuyvenberg@wisc.edu>
Date: Mon, 5 May 2014 16:43:24 -0500
Subject: [PATCH] --force: Propagate to shears.sh

After an annoying mistake and subsequent abort during a merging-rebase, I used the --force only to be stopped by a message from shears.sh telling me to use --force.

(As a side note, this commit could only have been made more amusing by submitting it yesterday...)
---
 share/msysGit/merging-rebase.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/msysGit/merging-rebase.sh b/share/msysGit/merging-rebase.sh
index 8edcc376..02a04e51 100755
--- a/share/msysGit/merging-rebase.sh
+++ b/share/msysGit/merging-rebase.sh
@@ -23,7 +23,7 @@ while test $# -gt 0
 do
 	case "$1" in
 	-f|--force)
-		force=t
+		force=--force
 		;;
 	-s|--show|-d|--dry-run)
 		dryrun=t
@@ -152,4 +152,4 @@ then
 	exit
 fi
 
-exec "$(dirname "$0")"/shears.sh --merging --onto=$TO ${REBASING_BASE:-$TO}
+exec "$(dirname "$0")"/shears.sh $force --merging --onto=$TO ${REBASING_BASE:-$TO}
-- 
2.11.4.GIT