kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'pb/rebase-doc-typofix' 

Typofix.

* pb/rebase-doc-typofix:
  git-rebase.txt: fix typo
maint
Junio C Hamano 2020-04-22 13:42:44 -07:00
parent 220546156a 344420bf0f
commit d0eb895058
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.txt
View File

@ -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