Re: Diffing submodule does not yield complete logs for merge commits

2015-06-02 Thread Heiko Voigt
On Sat, May 30, 2015 at 03:25:31PM -0500, Robert Dailey wrote: > On Sat, May 30, 2015 at 2:54 PM, Junio C Hamano wrote: > > Robert Dailey writes: > > > >> On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote: > >>> Robert Dailey writes: > >>> > In the meantime I'd like to ask, do we even

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Robert Dailey
On Sat, May 30, 2015 at 2:54 PM, Junio C Hamano wrote: > Robert Dailey writes: > >> On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote: >>> Robert Dailey writes: >>> In the meantime I'd like to ask, do we even need to add an option for this? What if we just make `diff.submodule lo

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Junio C Hamano
Robert Dailey writes: > On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote: >> Robert Dailey writes: >> >>> In the meantime I'd like to ask, do we even need to add an option for >>> this? What if we just make `diff.submodule log` not use >>> --first-parent? This seems like a backward compat

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Robert Dailey
On Sat, May 30, 2015 at 2:19 PM, Robert Dailey wrote: > On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote: >> Robert Dailey writes: >> >>> In the meantime I'd like to ask, do we even need to add an option for >>> this? What if we just make `diff.submodule log` not use >>> --first-parent? Th

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Robert Dailey
On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano wrote: > Robert Dailey writes: > >> In the meantime I'd like to ask, do we even need to add an option for >> this? What if we just make `diff.submodule log` not use >> --first-parent? This seems like a backward compatible change in of >> itself. >

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Junio C Hamano
Robert Dailey writes: > In the meantime I'd like to ask, do we even need to add an option for > this? What if we just make `diff.submodule log` not use > --first-parent? This seems like a backward compatible change in of > itself. Why? People have relied on submodule-log not to include all the

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-30 Thread Heiko Voigt
On Fri, May 29, 2015 at 09:18:11PM -0500, Robert Dailey wrote: > So I am working on trying to setup my environment (VM through Virtual Box) > to do some testing on this. You all have encouraged me to try the mailing > list review model. So I won't give up yet. I am not sure you need a VM or Linux

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-29 Thread Robert Dailey
On 5/21/2015 7:51 AM, Heiko Voigt wrote: On Tue, May 19, 2015 at 02:29:55PM -0500, Robert Dailey wrote: On Tue, May 19, 2015 at 5:44 AM, Heiko Voigt wrote: On Mon, May 18, 2015 at 10:06:32AM -0500, Robert Dailey wrote: Unfortunately I find it unintuitive and counter productive to perform inli

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-22 Thread Roberto Tyley
On Tuesday, 19 May 2015, Stefan Beller wrote: > On Tue, May 19, 2015 at 12:29 PM, Robert Dailey > wrote: > > How do you send your patches inline? > > This workflow discussion was a topic at the GitMerge2015 conference, > and there are essentially 2 groups, those who know how to send email > and t

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-21 Thread Heiko Voigt
On Tue, May 19, 2015 at 02:29:55PM -0500, Robert Dailey wrote: > On Tue, May 19, 2015 at 5:44 AM, Heiko Voigt wrote: > > On Mon, May 18, 2015 at 10:06:32AM -0500, Robert Dailey wrote: > >> Unfortunately I find it unintuitive and counter productive to perform > >> inline patches or do anything on a

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-04 Thread Jens Lehmann
Am 04.05.2015 um 17:05 schrieb Robert Dailey: On Fri, May 1, 2015 at 12:57 PM, Heiko Voigt wrote: Hi, On Wed, Apr 29, 2015 at 03:53:11PM -0500, Robert Dailey wrote: I am attempting to diff a submodule modified in my working copy and the only difference is a merge commit. However, I do not get

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-01 Thread Heiko Voigt
Hi, On Wed, Apr 29, 2015 at 03:53:11PM -0500, Robert Dailey wrote: > I am attempting to diff a submodule modified in my working copy and > the only difference is a merge commit. However, I do not get the > "full" range of commits introduced by the merge commit when I diff it: > > $ git diff --sub