From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>,
Marc Branchaud <marcnarc@xiplink.com>,
Philip Oakley <philipoakley@iee.email>,
Elijah Newren <newren@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
Stephen Haberman <stephen@exigencecorp.com>
Subject: [PATCH] doc: pull: fix rebase=false documentation
Date: Wed, 21 Jul 2021 17:15:45 -0500 [thread overview]
Message-ID: <20210721221545.1878514-1-felipe.contreras@gmail.com> (raw)
The behavior of --rebase=false is obviously wrong (as has been discussed
in big threads before [1] [2]): we want our users to merge their current
branch into the upstream branch, but this is not what the code is
currently doing; it does the *opposite*.
Fix the documentation so that we explain what the code actually does,
not what we wish it did.
[1] https://lore.kernel.org/git/20130522115042.GA20649@inner.h.apk.li/
[2] https://lore.kernel.org/git/4ay6w9i74cygt6ii1b0db7wg.1398433713382@email.android.com/
Cc: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-pull.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5c3fb67c01..7f4b2d1982 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the
`--preserve-merges` option passed to `git rebase` so that locally created
merge commits will not be flattened.
+
-When false, merge the current branch into the upstream branch.
+When false, merge the upstream branch into the current branch.
+
When `interactive`, enable the interactive mode of rebase.
+
--
2.32.0.40.gb9b36f9b52
next reply other threads:[~2021-07-21 22:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 22:15 Felipe Contreras [this message]
2021-07-21 23:33 ` [PATCH] doc: pull: fix rebase=false documentation Junio C Hamano
2021-07-22 0:21 ` Junio C Hamano
2021-07-22 1:24 ` Felipe Contreras
2021-07-23 7:30 ` Jeff King
2021-07-23 10:05 ` Philip Oakley
2021-07-23 16:54 ` Felipe Contreras
2021-07-23 15:58 ` Junio C Hamano
2021-07-23 18:29 ` Felipe Contreras
2021-07-23 21:44 ` Junio C Hamano
2021-07-24 3:56 ` Felipe Contreras
2021-07-23 16:36 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210721221545.1878514-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcnarc@xiplink.com \
--cc=newren@gmail.com \
--cc=philipoakley@iee.email \
--cc=stephen@exigencecorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).