Re: [PATCH] Documentation: reword rebase summary

From: Jacob Keller <jacob.keller@gmail.com>
Date: Mar 1, 2016, 23:01 UTC
Message-ID: <CA+P7+xp-YZJQh9=kHKnTEo-_k4xxniykH7pJ1neYbOS9em4N_Q@mail.gmail.com>
In-Reply-To: <1456872598-32571-1-git-send-email-sbeller@google.com>

On Tue, Mar 1, 2016 at 2:49 PM, Stefan Beller <sbeller@google.com> wrote:

Show 29 quoted lines

> 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
>

Seems like a reasonable summary to me, and definitely more fitting of what rebase does today.

Thanks, Jake