Merge branch 'maint'
commit34a5d35bbd6164cfbe08f5f14e359867ce80955b
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Sep 2008 06:15:44 +0000 (19 23:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Sep 2008 06:15:44 +0000 (19 23:15 -0700)
tree34021c00b8428d015583c7e9fffc5b8c1d37963e
parent05e8b3d6f43bd28aef85ec6e7658536510d6f959
parentcc185a6a8ac24737a26ec4b40cc401c2db8b2e97
Merge branch 'maint'

* maint:
  Start draft release notes for 1.6.0.3
  git-repack uses --no-repack-object, not --no-repack-delta.
  Typo "bogos" in format-patch error message.
  builtin-clone: fix typo
  Bust the ghost of long-defunct diffcore-pathspec.
  completion: git commit should list --interactive

Conflicts:
RelNotes
builtin-log.c
contrib/completion/git-completion.bash