diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 21:43:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 01:08:10 +0300 |
| commit | c5e610be5049f04b3ab8370bb8d1649347d2db87 (patch) | |
| tree | a8ee6bfb10db3fd6218f0787590dabcdf2e90b88 /git-rebase--interactive.sh | |
| parent | b325680930c007f87d35fdc60566b3441fedc7c3 (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>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions