From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Dec 2009 07:20:16 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc4~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b6b9f83ea19de3a98ca8466977aac2dc0bc03626;p=git.git

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()
---

b6b9f83ea19de3a98ca8466977aac2dc0bc03626