From: Matthieu Moy Date: Tue, 23 Feb 2016 21:04:41 +0000 (+0100) Subject: Documentation/git-push: document that 'simple' is the default X-Git-Tag: v2.8.0-rc0~14^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6b1fb372ee164e4cb2d15a9a325e13685f9dc2d;p=git-core%2Fgit.git Documentation/git-push: document that 'simple' is the default The default behavior is well documented already in git-config(1), but git-push(1) itself did not mention it at all. For users willing to learn how "git push" works but not how to configure it, this makes the documentation cumbersome to read. Make the git-push(1) page self-contained by adding a short summary of what 'push.default=simple' does, early in the page. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 135d810b7..d8c30a9c8 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -36,6 +36,13 @@ the default `` by consulting `remote.*.push` configuration, 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]] ------------------