git - 如何在 rebase 期间快速标记有冲突的决议？

Question

这是我的 git status 的一部分

# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       deleted by us:      ../../src/generic/asdfgsdfgsfg.java
#       deleted by us:      ../../src/generic/bsdfgsdf.java                                                                                                                                                             
#       deleted by us:      ../../src/generic/cdghdfgh.java                                                                                                                                                              
#       deleted by us:      ../../src/generic/dghkghjk.java                                                                                                                                                           
#       deleted by us:      ../../src/generic/eghkghjk.java                                                                                                                                                       
#       deleted by us:      ../../src/generic/fsdfgsdfg.java                                                                                                                                                    
#       deleted by us:      ../../src/generic/gsdfgsd.java                                                                                                                                                        
#       deleted by us:      ../../src/generic/hdsfgsdfg.java                                                                                                                                                    
#       deleted by us:      ../../src/generic/isdgsdfg.java                                                                                                                                                     
#       deleted by us:      ../../src/generic/jdsfgsd.java                                                                                                                                                    
#       deleted by us:      ../../src/generic/ksdf.java                                                                                                                                                       
#       deleted by us:      ../../src/generic/lnsfgnsg.java                                                                                                                                                             
#                   

知道在文件夹 ../../src/generic/ 中有很多文件，我怎样才能轻松快速地在每个文件上制作 git rm其他我不想删除的文件。

Answer 1

我不久前从 git wiki 上找到了这对非常棒的别名(它目前与 kernel.org 一起下线了):

edit-unmerged = \
    "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `
add-unmerged = \
    "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"

这可以根据 git status --porcelain 重新实现，在编写提示时它不存在，这将使重写 edit-unmerged 以避免包含删除冲突变得更容易，因为通常你想删除/保留它们，而不是编辑它们。但是 add-unmerged 完全适合您的用例!

像这样(未经测试):

add-unmerged = \
    "!f() { git status --porcelain | grep '^[ADU][ADU]' | cut -d" " -f2 }; git add `f`"
edit-unmerged = \
    "!f() { git status --porcelain | grep '^UU' | cut -d" " -f2 }; git add `f`"

调整第二个模式，直到它只包含您想要编辑的冲突类型。你肯定想要UU；您可能还想要 AU/UA，甚至 AA。 A 表示添加，D 表示删除，U 表示未 merge (修改)。