summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:50 (GMT)
commit23f536cf6236bf2a29026fea52c6bf7624b6485d (patch)
tree2738ba07faa16941f0d0d5dbc19ec39821920754 /contrib/completion
parenta75c3523d35144934e97f2660401e05b36ef8083 (diff)
parent3925b575687f64d49bd777ba6f64557a56b838b6 (diff)
downloadgit-23f536cf6236bf2a29026fea52c6bf7624b6485d.zip
git-23f536cf6236bf2a29026fea52c6bf7624b6485d.tar.gz
git-23f536cf6236bf2a29026fea52c6bf7624b6485d.tar.bz2
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
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9150ea6..0df356d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1584,7 +1584,7 @@ __git_log_common_options="
__git_log_gitk_options="
--dense --sparse --full-history
--simplify-merges --simplify-by-decoration
- --left-right
+ --left-right --notes --no-notes
"
# Options that go well for log and shortlog (not gitk)
__git_log_shortlog_options="