projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42817b9) | patch
merge: simplify ff-only option
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:25:32 +0000 (03:25 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Oct 2013 18:12:24 +0000 (11:12 -0700)
commit90f867b9a5088a2ea6f5844ae28b617821e77b28
tree09432e03d159e917d3e3eb3a0b72c08ff59a5be4tree | snapshot
parent42817b96b1b80b56fd5a4d5e0d6239524b1832a3commit | diff
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>
builtin/merge.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.