undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/doc-stash-remove-mention-of-reflog'

Browse Source 
Doc update.

* dl/doc-stash-remove-mention-of-reflog:
  Doc: reference the "stash list" in autostash docs
This commit is contained in:
Junio C Hamano 2020-05-08 14:25:09 -07:00
commit 6381c301ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge.txt
View File

@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
which case 'git merge --abort' applies the stash entry to the worktree which case 'git merge --abort' applies the stash entry to the worktree
whereas 'git reset --merge' will save the stashed changes in the stash whereas 'git reset --merge' will save the stashed changes in the stash
reflog. list.
--quit:: --quit::
Forget about the current merge in progress. Leave the index Forget about the current merge in progress. Leave the index
and the working tree as-is. If `MERGE_AUTOSTASH` is present, the and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
stash entry will be saved to the stash reflog. stash entry will be saved to the stash list.
--continue:: --continue::
After a 'git merge' stops due to conflicts you can conclude the After a 'git merge' stops due to conflicts you can conclude the

2
Documentation/git-rebase.txt
View File

@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
Abort the rebase operation but HEAD is not reset back to the Abort the rebase operation but HEAD is not reset back to the
original branch. The index and working tree are also left original branch. The index and working tree are also left
unchanged as a result. If a temporary stash entry was created unchanged as a result. If a temporary stash entry was created
using --autostash, it will be saved to the stash reflog. using --autostash, it will be saved to the stash list.
--apply: --apply:
Use applying strategies to rebase (calling `git-am` Use applying strategies to rebase (calling `git-am`