Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:42:26 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 00:42:26 +0000 (17:42 -0700)
* maint:
  Update draft release notes to 1.7.1.1
  notes: Initialise variable to appease gcc
  notes: check number of parameters to "git notes copy"

1  2 
builtin/notes.c
notes.c

diff --cc builtin/notes.c
Simple merge
diff --cc notes.c
Simple merge