summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-27 10:27:49 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-27 10:27:49 -0800
commit99e63ef24e18c8ca918922b052de96a8ceca48a4 (patch)
treef51f4546f505b9387b0b44f0cfeee1ed27217ad0 /git-rebase.sh
parent630fc7878b6fd1bc188d4916b64f4df37658df96 (diff)
parent960ac5ff99304404d287b8174d7c8a7743c6d97a (diff)
downloadgit-99e63ef24e18c8ca918922b052de96a8ceca48a4.tar.gz
Merge branch 'maint'
* maint: rebase -i: clarify in-editor documentation of "exec" tests: sanitize more git environment variables fast-import: treat filemodify with empty tree as delete rebase: give a better error message for bogus branch rebase: use explicit "--" with checkout Conflicts: t/t9300-fast-import.sh
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index d8e1903026..cbb0ea90ed 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -482,6 +482,7 @@ case "$#" in
then
head_name="detached HEAD"
else
+ echo >&2 "fatal: no such branch: $1"
usage
fi
;;
@@ -513,7 +514,7 @@ then
if test -z "$force_rebase"
then
# Lazily switch to the target branch if needed...
- test -z "$switch_to" || git checkout "$switch_to"
+ test -z "$switch_to" || git checkout "$switch_to" --
say "Current branch $branch_name is up to date."
exit 0
else