Merge branch 'jk/notes-ui-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:50 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:50 +0000 (15:58 -0700)
* jk/notes-ui-updates:
  contrib/completion: --notes, --no-notes
  log/pretty-options: Document --[no-]notes and deprecate old notes options
  revision.c: make --no-notes reset --notes list
  revision.c: support --notes command-line option
  notes: refactor display notes default handling
  notes: refactor display notes extra refs field
  revision.c: refactor notes ref expansion
  notes: make expand_notes_ref globally accessible

1  2 
builtin/notes.c
contrib/completion/git-completion.bash
t/t3301-notes.sh

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