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/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'nd/config-doc-camelCase' (diff) | |
| parent | push: allow --follow-tags to be set by config push.followTags (diff) | |
| download | tgif-61ca378275e83c48343c74a849ff0dcdef9abc91.tar.xz | |
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/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions