| commit | 0f4eba6a37c1a5454560b097873e5a22bfcde908 | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Fri, 12 Jan 2007 23:10:44 +0000 (12 23:10 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Fri, 12 Jan 2007 23:10:44 +0000 (12 23:10 +0000) | ||
| tree | db48982e6336f88ba45f8e4265baf6a8b8af5bc6 | treesnapshot (tar.gz zip) |
| parent | f7ed76a9b6158888e8efe2faef9c095802fd93fe | commitdiff |
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>
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 | diffblobblamehistory | |
| stgit/stack.py | diffblobblamehistory | |
| t/t1400-patch-history.sh | diffblobblamehistory |