From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jun 2010 17:17:26 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdc4204119d2847ea8f1ae5e44614be859951822;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
  Documentation: A...B shortcut for checkout and rebase
  Documentation/pretty-{formats,options}: better reference for "format:<string>"
---

bdc4204119d2847ea8f1ae5e44614be859951822