![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 28 Dec 2010 09:30:46 +0000 (10:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 23:05:45 +0000 (15:05 -0800) | ||
| commit | 322a42bf1b5292a18e1ff0b91a08d00ec68ffe95 | |
| tree | 1f7c1527ca9763e9ac0971511387a2e57fa58aab | tree | snapshot |
| parent | 6baafd848e7c238aecab4cc5ffb89a4293fcb964 | commit | diff |
git-rebase--am: remove unnecessary --3way option
Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--am.sh | diff | blob | history |