* [PATCH] Documentation: reword rebase summary
@ 2016-03-01 22:49 Stefan Beller
2016-03-01 23:01 ` Jacob Keller
2016-03-01 23:16 ` Kevin Daudt
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Beller @ 2016-03-01 22:49 UTC (permalink / raw)
To: git; +Cc: pdewulf, gitster, Stefan Beller
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation: reword rebase summary
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
1 sibling, 0 replies; 3+ messages in thread
From: Jacob Keller @ 2016-03-01 23:01 UTC (permalink / raw)
To: Stefan Beller; +Cc: Git mailing list, pdewulf, Junio C Hamano
On Tue, Mar 1, 2016 at 2:49 PM, Stefan Beller <sbeller@google.com> 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
>
Seems like a reasonable summary to me, and definitely more fitting of
what rebase does today.
Thanks,
Jake
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Documentation: reword rebase summary
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
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Daudt @ 2016-03-01 23:16 UTC (permalink / raw)
To: Stefan Beller; +Cc: git, pdewulf, gitster
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-01 23:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).