Merge branch 'maint'
commitc9c6cc8d7db312b9e8502f8d55422b8309cde2f3
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 15:27:53 +0000 (25 08:27 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 15:27:53 +0000 (25 08:27 -0700)
treef13048eaaa0dd450171d2bce68ebe17e7c3a1847
parentbaede9f803ff7becab815481b004bc983d0422c7
parent93feb4bb14dbd5c89701d6f2b0ab3d83dbc999c5
Merge branch 'maint'

* maint:
  Update release notes for 1.6.0.3
  checkout: Do not show local changes when in quiet mode
  for-each-ref: Fix --format=%(subject) for log message without newlines
  git-stash.sh: don't default to refs/stash if invalid ref supplied
  maint: check return of split_cmdline to avoid bad config strings
builtin-checkout.c
builtin-for-each-ref.c
builtin-merge.c
git.c