[PATCH 10/11] git-rebase: Usage string clean-up, emit usage string at incorrect invocation
From: <hidden>
Date: 2016-06-15 22:42:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Fredrik Kuivinen <redacted> --- git-rebase.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) e5739c10c7fb47d091cf774941da6e4b4629f350
diff --git a/git-rebase.sh b/git-rebase.sh
index 638ff0d..8a5f44a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -3,6 +3,7 @@ # Copyright (c) 2005 Junio C Hamano. # +USAGE='<upstream> [<head>]' . git-sh-setup # Make sure we do not have .dotest
@@ -19,7 +20,7 @@ you still have something valuable there. fi # The other head is given. Make sure it is valid. -other=$(git-rev-parse --verify "$1^0") || exit +other=$(git-rev-parse --verify "$1^0") || usage # Make sure we have HEAD that is valid. head=$(git-rev-parse --verify "HEAD^0") || exit
@@ -36,7 +37,7 @@ esac # If the branch to rebase is given, first switch to it. case "$#" in 2) - git-checkout "$2" || exit + git-checkout "$2" || usage esac # If the HEAD is a proper descendant of $other, we do not even need
--
0.99.9.GIT