summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 18:28:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-23 18:28:14 (GMT)
commit61ca378275e83c48343c74a849ff0dcdef9abc91 (patch)
tree86a974ebc83aaec75bf5b964fc5a85c631db56a3 /contrib
parentaa65b8602584fa91558b528527ff9008c1cceb69 (diff)
parenta8bc269f11b34e60f5fdbd8e831a654dd6b6b67e (diff)
downloadgit-61ca378275e83c48343c74a849ff0dcdef9abc91.zip
git-61ca378275e83c48343c74a849ff0dcdef9abc91.tar.gz
git-61ca378275e83c48343c74a849ff0dcdef9abc91.tar.bz2
Merge branch 'jk/push-config'
Restructure "git push" codepath to make it easier to add new configuration bits and then add push.followTags configuration that turns --follow-tags option on by default. * jk/push-config: push: allow --follow-tags to be set by config push.followTags cmd_push: pass "flags" pointer to config callback cmd_push: set "atomic" bit directly git_push_config: drop cargo-culted wt_status pointer
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 731c289..51d81d8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2186,6 +2186,7 @@ _git_config ()
pull.octopus
pull.twohead
push.default
+ push.followTags
rebase.autosquash
rebase.stat
receive.autogc