| commit | f1bb292121ea13f38886d54c21f6de0f506a4a90 | |
| author | Kyle J. McKay <mackyle@gmail.com> | |
| Sat, 3 Oct 2015 20:05:25 +0000 (3 13:05 -0700) | ||
| committer | Kyle J. McKay <mackyle@gmail.com> | |
| Sat, 3 Oct 2015 20:05:25 +0000 (3 13:05 -0700) | ||
| tree | 4fcaa40a84fb283a954d7a37303464c358b810a1 | treesnapshot (tar.gz zip) |
| parent | dd8b18dabe03f286d1afd11c362fce3ae6e5ee14 | commitdiff |
tg-export.sh: call rerere again after shell exit
Since d145a7b8 (Call git-rerere after a failing merge as git-merge
does, topgit-0.8), we've been calling git rerere when we have a
failed merge and are about to spawn a shell for the user to fix
it up.
However, we did not then call git rerere again after shell exit
to record the resolution. Fix that and call git rerere a second
time after the user has fixed the problem and exited the spawned
shell so the merge resolution will be recorded for future use.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Since d145a7b8 (Call git-rerere after a failing merge as git-merge
does, topgit-0.8), we've been calling git rerere when we have a
failed merge and are about to spawn a shell for the user to fix
it up.
However, we did not then call git rerere again after shell exit
to record the resolution. Fix that and call git rerere a second
time after the user has fixed the problem and exited the spawned
shell so the merge resolution will be recorded for future use.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
| tg-export.sh | diffblobblamehistory |