Merge branch 'sb/notes-parse-opt'
commit3b37d9c17efd199a237435f7d8573008f6aa68c1
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:28 +0000 (28 21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:28 +0000 (28 21:52 -0700)
tree4edc1150761b99e4624a527aa3adc2c2282d97c9
parentff0a181fa6580d29ce0ab7abf79780a1fa3c5555
parent74884b524e7e12b3419264d3180de785a9e39fa5
Merge branch 'sb/notes-parse-opt'

* sb/notes-parse-opt:
  notes: rework subcommands and parse options

Conflicts:
builtin/notes.c
builtin/notes.c
t/t3301-notes.sh