Merge branch 'maint'
commit445cac18c015809a7fcb4a570d3c6571b1ddaf7d
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 07:16:39 +0000 (29 00:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 07:16:39 +0000 (29 00:16 -0700)
tree89eeb8e6618d9eb582ea5bd1a2cf781625ebc001
parente990501312e22cfa910d88dc7143bc4eb3632ae1
parent53d1589ff6bd336e3ece39e0a963a3d2a537cf96
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
commit.h
diff.c
shell.c