summaryrefslogtreecommitdiff
path: root/Documentation
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 /Documentation
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 'Documentation')
-rw-r--r--Documentation/config.txt6
-rw-r--r--Documentation/git-push.txt5
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e119d06..2e5ceaf 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2111,6 +2111,12 @@ new default).
--
+push.followTags::
+ If set to true enable '--follow-tags' option by default. You
+ may override this configuration at time of push by specifying
+ '--no-follow-tags'.
+
+
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
rebase. False by default.
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index e1a46a7..5171086 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -128,7 +128,10 @@ already exists on the remote side.
Push all the refs that would be pushed without this option,
and also push annotated tags in `refs/tags` that are missing
from the remote but are pointing at commit-ish that are
- reachable from the refs being pushed.
+ reachable from the refs being pushed. This can also be specified
+ with configuration variable 'push.followTags'. For more
+ information, see 'push.followTags' in linkgit:git-config[1].
+
--signed::
GPG-sign the push request to update refs on the receiving