global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 01:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'je/doc-pull'

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-14 17:04:37 +09:00
parent 25ce0883fe 8ef7355a8f
commit c382988d7b
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. or `pull.ff` with your preferred behaviour.
If there's a merge conflict during the merge or rebase that you don't 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 want to handle, you can safely abort it with `git merge --abort` or
--rebase abort`. `git rebase --abort`.
OPTIONS OPTIONS
------- -------