projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b325680) | patch
git-rebase--am: remove unnecessary --3way option
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:58 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:10 +0000 (14:08 -0800)
commitc5e610be5049f04b3ab8370bb8d1649347d2db87
treea8ee6bfb10db3fd6218f0787590dabcdf2e90b88tree | snapshot
parentb325680930c007f87d35fdc60566b3441fedc7c3commit | 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>
git-rebase--am.sh diff | blob | history
Git—the stupid content tracker