{"thread":{"id":"25934","subject":"[PATCH] git-pull.txt: Mention branch.autosetuprebase","startedAt":"2010-12-03T08:20:54Z","lastAt":"2010-12-03T19:36:57Z","messageCount":3,"participants":["jari.aalto@cante.net","Jakub Narebski","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157180","messageId":"1291364454-9849-1-git-send-email-jari.aalto@cante.net","threadId":"25934","inReplyTo":null,"subject":"[PATCH] git-pull.txt: Mention branch.autosetuprebase","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-03T08:20:54Z","receivedAt":"2010-12-03T08:20:54Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\nIn \"Options related to merging\" mention also related option\nbranch.autosetuprebase in git-config(1).\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-pull.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex e47361f..7b4caac 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -98,8 +98,9 @@ include::merge-options.txt[]\n \tfetched, the rebase uses that information to avoid rebasing\n \tnon-local changes.\n +\n-See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make\n-`git pull` always use `{litdd}rebase` instead of merging.\n+See `branch.<name>.rebase` and `branch.autosetuprebase` in\n+linkgit:git-config[1] if you want to make `git pull` always use\n+`{litdd}rebase` instead of merging.\n +\n [NOTE]\n This is a potentially _dangerous_ mode of operation.\n-- \n1.7.2.3\n"},{"id":"157211","messageId":"m3k4jq3nxo.fsf@localhost.localdomain","threadId":"25934","inReplyTo":"1291364454-9849-1-git-send-email-jari.aalto@cante.net","subject":"Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-12-03T14:57:12Z","receivedAt":"2010-12-03T14:57:12Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"jari.aalto@cante.net writes:\n\n> From: Jari Aalto <jari.aalto@cante.net>\n> \n> In \"Options related to merging\" mention also related option\n> branch.autosetuprebase in git-config(1).\n> \n> Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n> ---\n\n> -See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make\n> -`git pull` always use `{litdd}rebase` instead of merging.\n> +See `branch.<name>.rebase` and `branch.autosetuprebase` in\n> +linkgit:git-config[1] if you want to make `git pull` always use\n> +`{litdd}rebase` instead of merging.\n\nGood catch.  Thanks.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"157247","messageId":"7v1v5yps12.fsf@alter.siamese.dyndns.org","threadId":"25934","inReplyTo":"1291364454-9849-1-git-send-email-jari.aalto@cante.net","subject":"Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-12-03T19:36:57Z","receivedAt":"2010-12-03T19:36:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"jari.aalto@cante.net writes:\n\n> From: Jari Aalto <jari.aalto@cante.net>\n>\n> In \"Options related to merging\" mention also related option\n> branch.autosetuprebase in git-config(1).\n>\n> Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n> ---\n>  Documentation/git-pull.txt |    5 +++--\n>  1 files changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n> index e47361f..7b4caac 100644\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -98,8 +98,9 @@ include::merge-options.txt[]\n>  \tfetched, the rebase uses that information to avoid rebasing\n>  \tnon-local changes.\n>  +\n> -See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make\n> -`git pull` always use `{litdd}rebase` instead of merging.\n> +See `branch.<name>.rebase` and `branch.autosetuprebase` in\n> +linkgit:git-config[1] if you want to make `git pull` always use\n> +`{litdd}rebase` instead of merging.\n\nThanks; will queue.\n"}]}