diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:44 -0700 |
| commit | d0eb8950587c1db601158b6c74dac67030b4d1d9 (patch) | |
| tree | 30eef50afade2d0d4c322ba6bf82196f643cfbb1 | |
| parent | Merge branch 'jk/p5310-drop-non-bitmap-timing' (diff) | |
| parent | git-rebase.txt: fix typo (diff) | |
| download | tgif-d0eb8950587c1db601158b6c74dac67030b4d1d9.tar.xz | |
Merge branch 'pb/rebase-doc-typofix'
Typofix.
* pb/rebase-doc-typofix:
git-rebase.txt: fix typo
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033607..46ddf172d9 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 |