• J
    git-update-index --unresolve · 2bd452d3
    Junio C Hamano 提交于
    Retire git-unresolve and make it into "git-update-index --unresolve".
    It processes all paths that follow.
    
    During a merge, you would mark a path that is dealt with with:
    
    	$ git update-index hello
    
    and you would "undo" it with:
    
    	$ git update-index --unresolve hello
    Signed-off-by: NJunio C Hamano <junkio@cox.net>
    2bd452d3
Makefile 18.8 KB