summaryrefslogtreecommitdiff
path: root/t/t4103-apply-binary.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-16 08:19:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-17 00:19:11 (GMT)
commit0c15cc921a54a2cd5f0758041fe9fdd715a493e8 (patch)
tree0664d258188752a4160f63e015964858ddfca8b6 /t/t4103-apply-binary.sh
parent92927ed0aac56a86f85049215791fcd106af4b62 (diff)
downloadgit-0c15cc921a54a2cd5f0758041fe9fdd715a493e8.zip
git-0c15cc921a54a2cd5f0758041fe9fdd715a493e8.tar.gz
git-0c15cc921a54a2cd5f0758041fe9fdd715a493e8.tar.bz2
git-am: --resolved.
After failed patch application, you can manually apply the patch (this includes resolving the conflicted merge after git-am falls back to 3-way merge) and run git-update-index on necessary paths to prepare the index file in a shape a successful patch application should have produced. Then re-running git-am --resolved would record the resulting index file along with the commit log information taken from the patch e-mail. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4103-apply-binary.sh')
0 files changed, 0 insertions, 0 deletions