From: Junio C Hamano Date: Fri, 26 Feb 2016 21:37:21 +0000 (-0800) Subject: Merge branch 'mm/push-simple-doc' X-Git-Tag: v2.8.0-rc0~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881?hp=-c Merge branch 'mm/push-simple-doc' The documentation did not clearly state that the 'simple' mode is now the default for "git push" when push.default configuration is not set. * mm/push-simple-doc: Documentation/git-push: document that 'simple' is the default --- 1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881 diff --combined Documentation/git-push.txt index 669a357c81,d8c30a9c81..cf6ee4a4df --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@@ -10,9 -10,8 +10,9 @@@ SYNOPSI -------- [verse] 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=] - [--repo=] [-f | --force] [--prune] [-v | --verbose] - [-u | --set-upstream] [--signed] + [--repo=] [-f | --force] [-d | --delete] [--prune] [-v | --verbose] + [-u | --set-upstream] + [--[no-]signed|--sign=(true|false|if-asked)] [--force-with-lease[=[:]]] [--no-verify] [ [...]] @@@ -37,6 -36,13 +37,13 @@@ the default `` by consulting ` and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`). + When neither the command-line nor the configuration specify what to + push, the default behavior is used, which corresponds to the `simple` + value for `push.default`: the current branch is pushed to the + corresponding upstream branch, but as a safety measure, the push is + aborted if the upstream branch does not have the same name as the + local one. + OPTIONS[[OPTIONS]] ------------------ @@@ -62,7 -68,7 +69,7 @@@ be named If `git push []` without any `` argument is set to update some ref at the destination with `` with `remote..push` configuration variable, `:` part can -be omitted---such a push will update a ref that `` normally updates +be omitted--such a push will update a ref that `` normally updates without any `` on the command line. Otherwise, missing `:` means to update the same ref as the ``. + @@@ -133,16 -139,12 +140,16 @@@ already exists on the remote side with configuration variable 'push.followTags'. For more information, see 'push.followTags' in linkgit:git-config[1]. - ---signed:: +--[no-]signed:: +--sign=(true|false|if-asked):: GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be - logged. See linkgit:git-receive-pack[1] for the details - on the receiving end. + logged. If `false` or `--no-signed`, no signing will be + attempted. If `true` or `--signed`, the push will fail if the + server does not support signed pushes. If set to `if-asked`, + sign if and only if the server supports signed pushes. The push + will also fail if the actual call to `gpg --sign` fails. See + linkgit:git-receive-pack[1] for the details on the receiving end. --[no-]atomic:: Use an atomic transaction on the remote side if available. @@@ -257,33 -259,22 +264,33 @@@ origin +master` to force a push to the is specified. This flag forces progress status even if the standard error stream is not directed to a terminal. ---recurse-submodules=check|on-demand:: - Make sure all submodule commits used by the revisions to be - pushed are available on a remote-tracking branch. If 'check' is - used Git will verify that all submodule commits that changed in - the revisions to be pushed are available on at least one remote - of the submodule. If any commits are missing the push will be - aborted and exit with non-zero status. If 'on-demand' is used - all submodules that changed in the revisions to be pushed will - be pushed. If on-demand was not able to push all necessary - revisions it will also be aborted and exit with non-zero status. +--no-recurse-submodules:: +--recurse-submodules=check|on-demand|no:: + May be used to make sure all submodule commits used by the + revisions to be pushed are available on a remote-tracking branch. + If 'check' is used Git will verify that all submodule commits that + changed in the revisions to be pushed are available on at least one + remote of the submodule. If any commits are missing the push will + be aborted and exit with non-zero status. If 'on-demand' is used + all submodules that changed in the revisions to be pushed will be + pushed. If on-demand was not able to push all necessary revisions + it will also be aborted and exit with non-zero status. A value of + 'no' or using '--no-recurse-submodules' can be used to override the + push.recurseSubmodules configuration variable when no submodule + recursion is required. --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely. +-4:: +--ipv4:: + Use IPv4 addresses only, ignoring IPv6 addresses. + +-6:: +--ipv6:: + Use IPv6 addresses only, ignoring IPv4 addresses. include::urls-remotes.txt[]