Makefile: Allow CC_LD_DYNPATH to be overriden

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2f8036d1d914ea54e4eabae3afbdca5f4a06ab43..158b91284147d50a24d6dadaa7c5085cf0b7cb55 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -885,7 +885,11 @@ _git_help ()
                return
                ;;
        esac
-       __gitcomp "$(__git_all_commands)"
+       __gitcomp "$(__git_all_commands)
+               attributes cli core-tutorial cvs-migration
+               diffcore gitk glossary hooks ignore modules
+               repository-layout tutorial tutorial-2
+               "
 }
 
 _git_init ()
@@ -972,6 +976,7 @@ _git_log ()
                        --decorate --diff-filter=
                        --color-words --walk-reflogs
                        --parents --children --full-history
+                       --merge
                        "
                return
                ;;