Merge branch 'js/replace-edit-use-editor-configuration'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ffe60048c1e50a2b3d9282cbab09721710232fbe..34024754d9296b56c194a7959afb7b7f28402457 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1458,6 +1458,7 @@ _git_log ()
                        --relative-date --date=
                        --pretty= --format= --oneline
                        --show-signature
+                       --cherry-mark
                        --cherry-pick
                        --graph
                        --decorate --decorate=