diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-09-05 11:26:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-02-02 16:38:22 +0000 |
commit | 60bbeaf9fb39b5d8d73ae3cf309ff29e8b705af3 (patch) | |
tree | d381c91bc3c8875f8732f18e4c673a4b817fe75f /git-debrebase.1.pod | |
parent | 209b87ba971701dffcd97a7fd9593cea51f62000 (diff) |
Terminology: Change "rewind" to "rewrite" where appropriate
In #928473, Colin Watson writes:
> the use of "rewind" as a synonym for "non-fast-forwarding", while
> somewhat common in git terminology, is unfortunate. The terms seem
> to be borrowed from video playback systems, where "rewind" is often
> just the exact opposite of "fast-forward", and so when I see
> "rewinding history" in a few places in dgit(1) my initial
> interpretation is that it must mean "updating a ref to point to an
> ancestor of the commit that it previously pointed to", whereas I
> think dgit(1) means "any push that isn't a fast-forward". I don't
> know if I'm the only one for whom it has that connotation.
This makes sense. So, I am changing uses of "rewind" which do not
mean precisely going back to an ancestor.
I think we can often use the word "rewrite" for the more general
case, but there are some places where another wording is better.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index d1b4507..bc1fdd6 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -129,7 +129,8 @@ You should consider using B<prepush> or B<conclude> instead. =item git-debrebase scrap Throws away all the work since the branch was last stitched. -This is done by rewinding you to ffq-prev. +This is done by resetting you to ffq-prev +and discarding all working tree changes. If you are in the middle of a git-rebase, will abort that too. |