Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 15:27:53 +0000 (08:27 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 15:27:53 +0000 (08:27 -0700)
* 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

1  2 
builtin-checkout.c
builtin-for-each-ref.c
builtin-merge.c
git.c

Simple merge
Simple merge
diff --cc builtin-merge.c
Simple merge
diff --cc git.c
Simple merge