From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Aug 2008 07:16:39 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~285
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=445cac18c015809a7fcb4a570d3c6571b1ddaf7d;p=git.git

Merge branch 'maint'

* maint:
  tutorial: gentler illustration of Alice/Bob workflow using gitk
  pretty=format: respect date format options
  make git-shell paranoid about closed stdin/stdout/stderr
  Document gitk --argscmd flag.
  Fix '--dirstat' with cross-directory renaming
  for-each-ref: Allow a trailing slash in the patterns
---

445cac18c015809a7fcb4a570d3c6571b1ddaf7d