| Message ID | pull.740.git.git.1585422720838.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | git-rebase.txt: fix typo | expand |
On Sat, Mar 28, 2020 at 12:44 PM Philippe Blain via GitGitGadget <gitgitgadget@gmail.com> wrote: > > From: Philippe Blain <levraiphilippeblain@gmail.com> > > Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> > --- > git-rebase.txt: fix typo > > CC: Junio C Hamano gitster@pobox.com [gitster@pobox.com], Elijah Newren > newren@gmail.com [newren@gmail.com] > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-740%2Fphil-blain%2Fdoc-rebase-typo-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-740/phil-blain/doc-rebase-typo-v1 > Pull-Request: https://github.com/git/git/pull/740 > > 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 f7a6033607f..46ddf172d9c 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -605,7 +605,7 @@ BEHAVIORAL DIFFERENCES > ----------------------- > > git rebase has two primary backends: apply and merge. (The apply > -backend used to known as the 'am' backend, but the name led to > +backend used to be known as the 'am' backend, but the name led to > confusion as it looks like a verb instead of a noun. Also, the merge > backend used to be known as the interactive backend, but it is now > used for non-interactive cases as well. Both were renamed based on > > base-commit: 3bab5d56259722843359702bc27111475437ad2a Thanks for catching my missing 'be'.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033607f..46ddf172d9c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -605,7 +605,7 @@ BEHAVIORAL DIFFERENCES ----------------------- git rebase has two primary backends: apply and merge. (The apply -backend used to known as the 'am' backend, but the name led to +backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on