Re: [PATCH 03/30] merge-recursive: Add explanation for src_entry and dst_entry

2017-11-13 Thread Junio C Hamano
Elijah Newren writes: > If I have to walk through the debugger and inspect the values found in > here in order to figure out their meaning, despite having known these > things inside and out some years back, then they probably need a comment > for the casual reader to explain

Re: [PATCH 03/30] merge-recursive: Add explanation for src_entry and dst_entry

2017-11-13 Thread Stefan Beller
On Mon, Nov 13, 2017 at 2:57 PM, Elijah Newren wrote: > > Perhaps: > > If 'before' is renamed to 'after' then src_entry will contain > the versions of 'before' from the merge_base, HEAD, and MERGE in > stages 1, 2, and 3; and dst_entry will contain the respective versions

Re: [PATCH 03/30] merge-recursive: Add explanation for src_entry and dst_entry

2017-11-13 Thread Elijah Newren
On Mon, Nov 13, 2017 at 1:06 PM, Stefan Beller wrote: > On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote: >> + /* >> +* Because I keep forgetting every few years what src_entry and >> +* dst_entry are and have to walk through a

Re: [PATCH 03/30] merge-recursive: Add explanation for src_entry and dst_entry

2017-11-13 Thread Stefan Beller
On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote: > If I have to walk through the debugger and inspect the values found in > here in order to figure out their meaning, despite having known these > things inside and out some years back, then they probably need a comment >