From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2011 22:58:50 +0000 (-0700)
Subject: Merge branch 'jk/notes-ui-updates'
X-Git-Tag: v1.7.6-rc0~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23f536cf6236bf2a29026fea52c6bf7624b6485d;p=git.git

Merge branch 'jk/notes-ui-updates'

* 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
---

23f536cf6236bf2a29026fea52c6bf7624b6485d