Merge branch 'maint-1.6.0' into maint
commit1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:40:19 +0000 (13 00:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:40:19 +0000 (13 00:40 -0800)
tree71ca0e8d6b33a53c3927748ca027c49277061cdb
parent9279bf3ab6739cd5854c21418c5d28412287ba07
parent12dd1112886f18730ee471420619e77783cd5943
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Avoid spurious error messages on error mistakes.
  contrib/examples/README: give an explanation of the status of these files
git-rebase--interactive.sh