~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f7ed76a) | patch
Track the files conflict history
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 12 Jan 2007 23:10:44 +0000 (23:10 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 12 Jan 2007 23:10:44 +0000 (23:10 +0000)
commit0f4eba6a37c1a5454560b097873e5a22bfcde908
treedb48982e6336f88ba45f8e4265baf6a8b8af5bc6tree | snapshot (tar.gz zip)
parentf7ed76a9b6158888e8efe2faef9c095802fd93fecommit | diff
Track the files conflict history

This commit refreshes a pushed patch even if there was a conflict (in
which case only the correctly merged files are merged). The refresh
after fixing the conflict would log the conflict files in the patch
history.

The patch also updates the index in the case of the interactive merge.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/gitmergeonefile.py diff | blob | blame | history
stgit/stack.py diff | blob | blame | history
t/t1400-patch-history.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)