Paul Campbell>From b6c810480547966c73bcaaea4c069fe73dacbc05 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net> Date: Sat, 9 Mar 2013 18:32:24 +0000 Subject: [PATCH 06/19] merging change from nresni
manual merge at the moment...i'll try a proper merge next now that formatting is cleaner
Conflicts: git-subtree.sh
Fixes hidden carriage return
Original-Author: mhoffman <matt.hoffman@quantumretail.com> Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net> --- contrib/subtree/git-subtree.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Show changes to contrib/subtree/git-subtree.sh +1 −2
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 74e4c74..8056851 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -605,8 +605,7 @@ cmd_split() eval "$grl" | while read rev parents; do revcount=$(($revcount + 1)) - say -n "$revcount/$revmax ($createcount) -" + say -ne "$revcount/$revmax ($createcount)\r" debug "Processing commit: $rev" exists=$(cache_get $rev) if [ -n "$exists" ]; then
-- 1.8.2.rc1 -- Paul [W] Campbell