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()
This commit is contained in:
Junio C Hamano
2009-12-19 23:20:16 -08:00
3 changed files with 57 additions and 5 deletions

View File

@ -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"