From: Kevin Daudt <me@ikke.info>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, pdewulf@lyra-network.com, gitster@pobox.com
Subject: Re: [PATCH] Documentation: reword rebase summary
Date: Wed, 2 Mar 2016 00:16:48 +0100 [thread overview]
Message-ID: <20160301231648.GA26165@ikke.info> (raw)
In-Reply-To: <1456872598-32571-1-git-send-email-sbeller@google.com>
On Tue, Mar 01, 2016 at 02:49:58PM -0800, Stefan Beller wrote:
> The wording is introduced in c3f0baaca (Documentation: sync git.txt
> command list and manual page title, 2007-01-18), but rebase has evolved
> since then, capture the modern usage by being more generic about the
> rebase command in the summary.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> Inspired by
> https://medium.freecodecamp.com/git-rebase-and-the-golden-rule-explained-70715eccc372
> (I tried to cc the author, but I am not sure if I got the right email address)
>
> Thanks,
> Stefan
>
> Documentation/git-rebase.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 6cca8bb..6ed610a 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -3,7 +3,7 @@ git-rebase(1)
>
> NAME
> ----
> -git-rebase - Forward-port local commits to the updated upstream head
> +git-rebase - Reapply commits on top of another base tip
>
> SYNOPSIS
> --------
> --
> 2.8.0.rc0
>
I was thinking about doing the same. Thanks for improving this.
prev parent reply other threads:[~2016-03-01 23:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 22:49 [PATCH] Documentation: reword rebase summary Stefan Beller
2016-03-01 23:01 ` Jacob Keller
2016-03-01 23:16 ` Kevin Daudt [this message]
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=20160301231648.GA26165@ikke.info \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pdewulf@lyra-network.com \
--cc=sbeller@google.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).