From: Philippe Blain <levraiphilippeblain@xxxxxxxxx> Signed-off-by: Philippe Blain <levraiphilippeblain@xxxxxxxxx> --- git-rebase.txt: fix typo CC: Junio C Hamano gitster@xxxxxxxxx [gitster@xxxxxxxxx], Elijah Newren newren@xxxxxxxxx [newren@xxxxxxxxx] 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 -- gitgitgadget