Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: Merge made by recursive?

From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:51:19

Hi Shawn,

Shawn Ligocki writes:
Is this intentionally bad grammar? Every time I see it, I cringe a little. What
does it even mean? That it merged incrementally through each subsequent revision?
I suppose it's yet another quirk I've got used to -- "recursive"
refers to the merge strategy that was used; see git-merge(1). We can
definitely make the Porcelain say something nicer like `merged
successfully using "recursive" merge strategy`.

Patches are welcome: see Documentation/SubmittingPatches :)

-- Ram
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help