diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-08 00:41:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-08 01:23:53 -0800 |
| commit | 4bfb6b62ffc9460798ebc78c3a30e4eff7c409d0 (patch) | |
| tree | 75922cf23cc070e2d5220d961a8f645f1bc8bb60 /git-merge-recursive.py | |
| parent | ls-files and read-tree need core.filemode (diff) | |
| download | git-4bfb6b62ffc9460798ebc78c3a30e4eff7c409d0.tar.gz git-4bfb6b62ffc9460798ebc78c3a30e4eff7c409d0.zip | |
git-am: do not lose already edited final-commit when resuming.
The last round stopped munging the patch when resuming, but
failed to preserve final-commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions