git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff0a181 74884b5)
Merge branch 'sb/notes-parse-opt'
authorJunio C Hamano <redacted>
Mon, 29 Mar 2010 04:52:28 +0000 (21:52 -0700)
committerJunio C Hamano <redacted>
Mon, 29 Mar 2010 04:52:28 +0000 (21:52 -0700)
* sb/notes-parse-opt:
  notes: rework subcommands and parse options

Conflicts:
builtin/notes.c

1  2 
builtin/notes.c patch | diff1 | diff2 | blob | history
t/t3301-notes.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/notes.c
Simple merge
diff --cc t/t3301-notes.sh
Simple merge
git clone https://git.99rst.org/PROJECT