diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-16 00:19:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-16 16:19:11 -0800 |
| commit | 0c15cc921a54a2cd5f0758041fe9fdd715a493e8 (patch) | |
| tree | 0664d258188752a4160f63e015964858ddfca8b6 /show-branch.c | |
| parent | git-apply: fail if a patch cannot be applied. (diff) | |
| download | tgif-0c15cc921a54a2cd5f0758041fe9fdd715a493e8.tar.xz | |
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 'show-branch.c')
0 files changed, 0 insertions, 0 deletions