git/Documentation/git-push.txt, branch v2.4.9

Merge branch 'jk/asciidoc-markup-fix' into maint

2015-06-05T19:00:19Z

Various documentation mark-up fixes to make the output more consistent in general and also make AsciiDoctor (an alternative formatter) happier. * jk/asciidoc-markup-fix: doc: convert AsciiDoc {?foo} to ifdef::foo[] doc: put example URLs and emails inside literal backticks doc: drop backslash quoting of some curly braces doc: convert \--option to --option doc/add: reformat `--edit` option doc: fix length of underlined section-title doc: fix hanging "+"-continuation doc: fix unquoted use of "{type}" doc: fix misrendering due to `single quote'

doc: convert \--option to --option

2015-05-13T05:14:46Z

Older versions of AsciiDoc would convert the "--" in "--option" into an emdash. According to 565e135 (Documentation: quote double-dash for AsciiDoc, 2011-06-29), this is fixed in AsciiDoc 8.3.0. According to bf17126, we don't support anything older than 8.4.1 anyway, so we no longer need to worry about quoting. Even though this does not change the output at all, there are a few good reasons to drop the quoting: 1. It makes the source prettier to read. 2. We don't quote consistently, which may be confusing when reading the source. 3. Asciidoctor does not like the quoting, and renders a literal backslash. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ph/push-doc-cas' into maint

2015-03-31T21:52:24Z

* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording

Merge branch 'ph/push-doc-cas'

2015-03-28T16:37:53Z

* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording

git-push.txt: clean up force-with-lease wording

2015-03-26T18:41:24Z

The help text for the --force-with-lease option to git-push does not parse cleanly. Clean up the wording and syntax to be more sensible. Also remove redundant information in the "--force-with-lease alone" description. Signed-off-by: Phil Hord Signed-off-by: Junio C Hamano

Merge branch 'jk/push-config'

2015-03-23T18:28:14Z

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

push: allow --follow-tags to be set by config push.followTags

2015-03-14T22:08:35Z

Signed-off-by: Dave Olszewski Helped-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'mg/push-repo-option-doc' into maint

2015-02-25T06:10:19Z

The "git push" documentation made the "--repo=" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo

Merge branch 'mg/push-repo-option-doc'

2015-02-17T18:15:31Z

The "git push" documentation made the "--repo=" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo

Merge branch 'sb/atomic-push'

2015-02-11T21:43:51Z

"git push" has been taught a "--atomic" option that makes push to update more than one ref an "all-or-none" affair. * sb/atomic-push: Document receive.advertiseatomic t5543-atomic-push.sh: add basic tests for atomic pushes push.c: add an --atomic argument send-pack.c: add --atomic command line argument send-pack: rename ref_update_to_be_sent to check_to_send_update receive-pack.c: negotiate atomic push support receive-pack.c: add execute_commands_atomic function receive-pack.c: move transaction handling in a central place receive-pack.c: move iterating over all commands outside execute_commands receive-pack.c: die instead of error in case of possible future bug receive-pack.c: shorten the execute_commands loop over all commands