averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'je/doc-pull' into jch

Browse Source 
Doc fixup.

* je/doc-pull:
  doc: git-pull: fix 'git --rebase abort' typo
This commit is contained in:
Junio C Hamano
2025-12-12 15:53:02 +09:00
parent 88daf13b15 8ef7355a8f
commit dd92090fda
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-pull.adoc
View File

@@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`,
or `pull.ff` with your preferred behaviour.
If there's a merge conflict during the merge or rebase that you don't
want to handle, you can safely abort it with `git merge --abort` or `git
--rebase abort`.
want to handle, you can safely abort it with `git merge --abort` or
`git rebase --abort`.
OPTIONS
-------