diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-27 10:27:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-27 10:27:49 -0800 |
| commit | 99e63ef24e18c8ca918922b052de96a8ceca48a4 (patch) | |
| tree | f51f4546f505b9387b0b44f0cfeee1ed27217ad0 /git-rebase--interactive.sh | |
| parent | 630fc7878b6fd1bc188d4916b64f4df37658df96 (diff) | |
| parent | 960ac5ff99304404d287b8174d7c8a7743c6d97a (diff) | |
| download | git-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--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a5ffd9a31e..5873ba4bc3 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -894,7 +894,7 @@ first and then run 'git rebase --continue' again." if test ! -z "$1" then - output git checkout "$1" || + output git checkout "$1" -- || die "Could not checkout $1" fi @@ -1021,7 +1021,7 @@ first and then run 'git rebase --continue' again." # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message -# x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails +# x, exec = run command (the rest of the line) using shell # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. |