{"thread":{"id":"34182","subject":"[PATCH] fixup! push: switch default from \"matching\" to \"simple\"","startedAt":"2013-06-17T18:01:19Z","lastAt":"2013-06-17T20:48:03Z","messageCount":3,"participants":["Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"221085","messageId":"1371492079-19283-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"34182","inReplyTo":null,"subject":"[PATCH] fixup! push: switch default from \"matching\" to \"simple\"","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2013-06-17T18:01:19Z","receivedAt":"2013-06-17T18:01:19Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n---\nThis is to be squashed into jc/push-2.0-default-to-simple\n\n(Noticed while writing the other patch about --force)\n\n Documentation/git-push.txt | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 9b9e7d1..81b875b 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -381,8 +381,10 @@ Examples\n \tconfigured for the current branch).\n \n `git push origin`::\n-\tWithout additional configuration, works like\n-\t`git push origin :`.\n+\tWithout additional configuration, pushes the current branch to\n+\tthe configured upstream (`remote.origin.merge` configuration\n+\tvariable) if it has the same name as the current branch, and\n+\terrors out without pushing otherwise.\n +\n The default behavior of this command when no <refspec> is given can be\n configured by setting the `push` option of the remote, or the `push.default`\n-- \n1.8.3.1.495.g13f33cf.dirty\n"},{"id":"221093","messageId":"7vhagwcyqf.fsf@alter.siamese.dyndns.org","threadId":"34182","inReplyTo":"1371492079-19283-1-git-send-email-Matthieu.Moy@imag.fr","subject":"Re: [PATCH] fixup! push: switch default from \"matching\" to \"simple\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-17T19:40:24Z","receivedAt":"2013-06-17T19:40:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy <Matthieu.Moy@imag.fr> writes:\n\n> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n> ---\n> This is to be squashed into jc/push-2.0-default-to-simple\n>\n> (Noticed while writing the other patch about --force)\n\nThanks.\n\nNote that this has to further change if Ram's triangular push fix\ncomes before 2.0.\n\nI am not sure if these original two lines are necessary.  Wouldn't\nit more appropriate to just drop the \"Without additional configuration\"\nand go straight to \"The default behaviour of this command...\"?\n\n>  Documentation/git-push.txt | 6 ++++--\n>  1 file changed, 4 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\n> index 9b9e7d1..81b875b 100644\n> --- a/Documentation/git-push.txt\n> +++ b/Documentation/git-push.txt\n> @@ -381,8 +381,10 @@ Examples\n>  \tconfigured for the current branch).\n>  \n>  `git push origin`::\n> -\tWithout additional configuration, works like\n> -\t`git push origin :`.\n> +\tWithout additional configuration, pushes the current branch to\n> +\tthe configured upstream (`remote.origin.merge` configuration\n> +\tvariable) if it has the same name as the current branch, and\n> +\terrors out without pushing otherwise.\n>  +\n>  The default behavior of this command when no <refspec> is given can be\n>  configured by setting the `push` option of the remote, or the `push.default`\n"},{"id":"221104","messageId":"vpqy5a8wjjw.fsf@anie.imag.fr","threadId":"34182","inReplyTo":"7vhagwcyqf.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] fixup! push: switch default from \"matching\" to \"simple\"","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-06-17T20:48:03Z","receivedAt":"2013-06-17T20:48:03Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Note that this has to further change if Ram's triangular push fix\n> comes before 2.0.\n\nI didn't follow precisely this topic. In any case, better have this in\nthe patch, if only as a reminder that this part will need to be updated.\n\n> I am not sure if these original two lines are necessary.  Wouldn't\n> it more appropriate to just drop the \"Without additional configuration\"\n> and go straight to \"The default behaviour of this command...\"?\n\nI think it makes sense to avoid having to go through too many sections\nto understand the default behavior.\n\nRight now, to know what \"git push\" does, the reader reads the\nDESCRIPTION and finds nothing, reads the <refspec>... part and does not\nsee what happens when it's omitted, then see the EXAMPLE section\n\ngit push\n=> see git push origin\n\ngit push origin\n=> see push.default in git config --help\n\nAt least, keeping these lines, we avoid the last indirection.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}