• J
    revert: write REVERT_HEAD pseudoref during conflicted revert · 82433cdf
    Jonathan Nieder 提交于
    When conflicts are encountered while reverting a commit, it can be
    handy to have the name of that commit easily available.  For example,
    to produce a copy of the patch to refer to while resolving conflicts:
    
    	$ git revert 2eceb2a8
    	error: could not revert 2eceb2a8... awesome, buggy feature
    	$ git show -R REVERT_HEAD >the-patch
    	$ edit $(git diff --name-only)
    
    Set a REVERT_HEAD pseudoref when "git revert" does not make a commit,
    for cases like this.  This also makes it possible for scripts to
    distinguish between a revert that encountered conflicts and other
    sources of an unmerged index.
    
    After successfully committing, resetting with "git reset", or moving
    to another commit with "git checkout" or "git reset", the pseudoref is
    no longer useful, so remove it.
    Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    82433cdf
commit.c 43.1 KB