| commit | ec96224e215f1b2f143524afa339564271c11e12 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Sun, 20 Jul 2008 12:12:48 +0000 (20 14:12 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Jul 2008 18:34:06 +0000 (20 11:34 -0700) | ||
| tree | 7ae4c861e6347e3251885b00500a47c0fce1e17a | treesnapshot (tar.gz zip) |
| parent | b0f2ecf5935335ba72f406bfc88634142c5694cd | commitdiff |
Teach 'git merge' that some merge strategies no longer exist
'recur' co-existed with 'recursive' when rewriting it in C, but it no
longer available. 'stupid' was also recently removed.
"git merge -s confused origin" still includes them in the list of
available merge strategies.
[jc: this is a squash of two micropatches]
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
'recur' co-existed with 'recursive' when rewriting it in C, but it no
longer available. 'stupid' was also recently removed.
"git merge -s confused origin" still includes them in the list of
available merge strategies.
[jc: this is a squash of two micropatches]
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory |