threads / patch / 41588

patchDocumentation: reword rebase summary

Subject: [PATCH] Documentation: reword rebase summary

## tl;dr

3 messages between Mar 1, 2016 and Mar 1, 2016. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Stefan Beller· Mar 1, 2016, 22:49 UTC · lore

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

Show changes to Documentation/git-rebase.txt +1 −1

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

Jacob Keller· Mar 1, 2016, 23:01 UTC · re: Stefan Beller · lore

Re: [PATCH] Documentation: reword rebase summary

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

Kevin Daudt· Mar 1, 2016, 23:16 UTC · re: Stefan Beller · lore

Re: [PATCH] Documentation: reword rebase summary

On Tue, Mar 01, 2016 at 02:49:58PM -0800, Stefan Beller wrote:

Show 34 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
>  
>  SYNOPSIS
>  --------
> -- 
> 2.8.0.rc0
>

I was thinking about doing the same. Thanks for improving this.