-
由 Lars Hjemli 提交于
These options are supported by git-merge, but git-pull didn't know about them. Signed-off-by: NLars Hjemli <hjemli@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
5072a323
These options are supported by git-merge, but git-pull didn't know about them. Signed-off-by: NLars Hjemli <hjemli@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>