diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-19 23:20:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-19 23:20:16 -0800 |
| commit | b6b9f83ea19de3a98ca8466977aac2dc0bc03626 (patch) | |
| tree | e6db2e21243d77e77b9e29185504fc4dc7764215 /git-rebase--interactive.sh | |
| parent | 8eca03c86134c3f73eb8f16899165a3bd2014376 (diff) | |
| parent | e49ca974d6ff2dda1ff4ee39e7cc33af33d1eb2a (diff) | |
| download | git-b6b9f83ea19de3a98ca8466977aac2dc0bc03626.tar.gz | |
Merge branch 'maint'
* maint:
rebase -i: abort cleanly if the editor fails to launch
technical-docs: document hash API
api-strbuf.txt: fix typos and document launch_editor()
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0bd3bf78b8..d52932878c 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -779,7 +779,7 @@ EOF cp "$TODO" "$TODO".backup git_editor "$TODO" || - die "Could not execute editor" + die_abort "Could not execute editor" has_action "$TODO" || die_abort "Nothing to do" |