| commit | 90f867b9a5088a2ea6f5844ae28b617821e77b28 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Thu, 31 Oct 2013 09:25:32 +0000 (31 03:25 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 31 Oct 2013 18:12:24 +0000 (31 11:12 -0700) | ||
| tree | 09432e03d159e917d3e3eb3a0b72c08ff59a5be4 | treesnapshot (tar.gz zip) |
| parent | 42817b96b1b80b56fd5a4d5e0d6239524b1832a3 | commitdiff |
merge: simplify ff-only option
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |