From: Felipe Contreras Date: Fri, 30 Aug 2013 21:56:47 GMT Subject: [PATCH 3/6] rebase: trivial style fixes Message-ID: <1377899810-1818-4-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1377899810-1818-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 8d7659a..2c02853 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -324,7 +324,7 @@ done test $# -gt 2 && usage if test -n "$cmd" && - test "$interactive_rebase" != explicit + test "$interactive_rebase" != explicit then die "$(gettext "The --exec option must be used with the --interactive option")" fi @@ -486,7 +486,7 @@ case "$#" in switch_to="$1" if git show-ref --verify --quiet -- "refs/heads/$1" && - orig_head=$(git rev-parse -q --verify "refs/heads/$1") + orig_head=$(git rev-parse -q --verify "refs/heads/$1") then head_name="refs/heads/$1" elif orig_head=$(git rev-parse -q --verify "$1") -- 1.8.4-fc