From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Vít Ondruch" <vondruch@redhat.com>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Alex Henrie" <alexhenrie24@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Elijah Newren" <newren@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 0/2] pull: documentation improvements
Date: Tue, 22 Jun 2021 19:48:13 -0500 [thread overview]
Message-ID: <20210623004815.1807-1-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210621175234.1079004-1-felipe.contreras@gmail.com>
These are the non-controversial changes from last-year series [1] which
objectively improve our documentation and don't have any reason not to
be merged.
Not everyone knows what a rebase or a fast-forward is.
Since v1 I removed one line of advice because now a second person--Alex
Henrie--objected to it. The line is still useful, but can be added
later.
[1] https://lore.kernel.org/git/20201218211026.1937168-1-felipe.contreras@gmail.com/
Felipe Contreras (2):
doc: pull: explain what is a fast-forward
pull: improve default warning
Documentation/git-pull.txt | 41 ++++++++++++++++++++++++++++++++------
builtin/pull.c | 21 +++++++++----------
2 files changed, 46 insertions(+), 16 deletions(-)
Range-diff against v1:
1: 949e814b27 = 1: 949e814b27 doc: pull: explain what is a fast-forward
2: 8a72fa35ef ! 2: cfb60a24d6 pull: improve default warning
@@ builtin/pull.c: static int get_can_ff(struct object_id *orig_head, struct object
+ " git config --global pull.rebase true # rebase\n"
+ " git config --global pull.ff only # fast-forward only\n"
+ "\n"
-+ "If unsure, run \"git pull --no-rebase\".\n"
+ "Read \"git pull --help\" for more information."));
}
--
2.32.0
next prev parent reply other threads:[~2021-06-23 0:48 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 17:52 [PATCH 0/2] pull: documentation improvements Felipe Contreras
2021-06-21 17:52 ` [PATCH 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-22 5:51 ` Bagas Sanjaya
2021-06-23 1:11 ` Felipe Contreras
2021-06-24 14:21 ` Philip Oakley
2021-06-24 14:31 ` Felipe Contreras
2021-06-24 16:59 ` Philip Oakley
2021-06-24 19:05 ` Felipe Contreras
2021-06-24 22:07 ` Philip Oakley
2021-06-24 23:41 ` Felipe Contreras
2021-06-25 9:12 ` Ævar Arnfjörð Bjarmason
2021-06-25 10:47 ` Felipe Contreras
2021-06-25 10:59 ` Ævar Arnfjörð Bjarmason
2021-06-25 15:49 ` Felipe Contreras
2021-06-25 16:53 ` Kerry, Richard
2021-06-25 17:34 ` Felipe Contreras
2021-06-25 21:36 ` Felipe Contreras
2021-06-21 17:52 ` [PATCH 2/2] pull: improve default warning Felipe Contreras
2021-06-21 18:05 ` Alex Henrie
2021-06-21 18:51 ` Felipe Contreras
2021-06-21 21:47 ` Alex Henrie
2021-06-21 22:12 ` Felipe Contreras
2021-06-22 3:15 ` Alex Henrie
2021-06-22 4:26 ` Felipe Contreras
2021-06-22 15:06 ` Elijah Newren
2021-06-22 21:22 ` Alex Henrie
2021-06-23 2:20 ` Elijah Newren
2021-06-23 4:18 ` Felipe Contreras
2021-06-23 6:47 ` Elijah Newren
2021-06-23 17:24 ` Felipe Contreras
2021-06-23 1:09 ` Felipe Contreras
2021-06-23 7:54 ` Elijah Newren
2021-06-23 18:19 ` Felipe Contreras
2021-06-24 3:38 ` Alex Henrie
2021-06-24 5:55 ` Felipe Contreras
2021-06-27 0:17 ` Alex Henrie
2021-06-27 4:21 ` Felipe Contreras
2021-06-23 0:48 ` Felipe Contreras [this message]
2021-06-23 0:48 ` [PATCH v2 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 2/2] pull: improve default warning 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623004815.1807-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=vondruch@redhat.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).