Merge branch 'maint'
commit1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Mar 2008 08:03:16 +0000 (16 01:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Mar 2008 08:03:16 +0000 (16 01:03 -0700)
tree297e91429f4c03aea386016640dc4d1da06b323e
parentf4198c9b7d319a7a595f0d759e7d8094387ab77b
parent81d66500c1e47d19c18d643ef074e0475dc90eb1
Merge branch 'maint'

* maint:
  Start draft ReleaseNotes for 1.5.4.5
  rebase -m: do not trigger pre-commit verification

Conflicts:

RelNotes
git-rebase.sh