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

revisions.txt: be explicit about commands writing 'ORIG_HEAD'

Browse Source 
When mentioning 'ORIG_HEAD', be explicit about which command write that
pseudo-ref, namely 'git am', 'git merge', 'git rebase' and 'git reset'.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Blain 2023-01-10 13:15:20 +00:00 committed by Junio C Hamano
parent 0c514d5766
commit c6eec9cb36
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/revisions.txt
View File

@ -49,7 +49,8 @@ characters and to avoid word splitting.
`FETCH_HEAD` records the branch which you fetched from a remote repository `FETCH_HEAD` records the branch which you fetched from a remote repository
with your last `git fetch` invocation. with your last `git fetch` invocation.
`ORIG_HEAD` is created by commands that move your `HEAD` in a drastic `ORIG_HEAD` is created by commands that move your `HEAD` in a drastic
way, to record the position of the `HEAD` before their operation, so that way (`git am`, `git merge`, `git rebase`, `git reset`),
to record the position of the `HEAD` before their operation, so that
you can easily change the tip of the branch back to the state before you ran you can easily change the tip of the branch back to the state before you ran
them. them.
`MERGE_HEAD` records the commit(s) which you are merging into your branch `MERGE_HEAD` records the commit(s) which you are merging into your branch