Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pull: accept --rebase=merges to recreate the branch topology
[gitweb.git]
/
contrib
/
completion
/
git-completion.bash
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index e646900409938650b10b5adaf02731a2af85e14b..7fe2e213d1dbc137048322f3feb934bf974aa5bc 100644
(file)
--- a/
contrib/completion/git-completion.bash
+++ b/
contrib/completion/git-completion.bash
@@
-2115,7
+2115,7
@@
_git_config ()
return
;;
branch.*.rebase)
- __gitcomp "false true preserve interactive"
+ __gitcomp "false true
merges
preserve interactive"
return
;;
remote.pushdefault)