From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Mar 2011 21:56:13 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ea9f9d6c28caf886747ca256e9d39d24f03d229;p=git.git

Merge branch 'maint'

* maint:
  git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
  bisect: visualize with git-log if gitk is unavailable
---

1ea9f9d6c28caf886747ca256e9d39d24f03d229