diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:28:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:28:14 -0700 |
| commit | 61ca378275e83c48343c74a849ff0dcdef9abc91 (patch) | |
| tree | 86a974ebc83aaec75bf5b964fc5a85c631db56a3 /Documentation/config.txt | |
| parent | aa65b8602584fa91558b528527ff9008c1cceb69 (diff) | |
| parent | a8bc269f11b34e60f5fdbd8e831a654dd6b6b67e (diff) | |
| download | git-61ca378275e83c48343c74a849ff0dcdef9abc91.tar.gz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index e119d06d2b..2e5ceaf719 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. |