Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Mar 2008 08:03:16 +0000 (01:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Mar 2008 08:03:16 +0000 (01:03 -0700)
* maint:
  Start draft ReleaseNotes for 1.5.4.5
  rebase -m: do not trigger pre-commit verification

Conflicts:

RelNotes

1  2 
git-rebase.sh

diff --cc git-rebase.sh
Simple merge