Matthieu Moy <matthieu....@imag.fr> writes:
> Signed-off-by: Matthieu Moy <matthieu....@imag.fr>
> This is to be squashed into jc/push-2.0-default-to-simple
> (Noticed while writing the other patch about --force)
Note that this has to further change if Ram's triangular push fix
comes before 2.0.
I am not sure if these original two lines are necessary. Wouldn't
it more appropriate to just drop the "Without additional configuration"
and go straight to "The default behaviour of this command..."?
> Documentation/git-push.txt | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index 9b9e7d1..81b875b 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -381,8 +381,10 @@ Examples
> configured for the current branch).
> `git push origin`::
> - Without additional configuration, works like
> - `git push origin :`.
> + Without additional configuration, pushes the current branch to
> + the configured upstream (`remote.origin.merge` configuration
> + variable) if it has the same name as the current branch, and
> + errors out without pushing otherwise.
> The default behavior of this command when no <refspec> is given can be
> configured by setting the `push` option of the remote, or the `push.default`
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html