On 7 July 2015 at 01:48, Peter Stuge wrote:
> fact that a merge commit ideally does *not* contain any
> modifications.
That's not /entirely/ true. The merge commit will have a new TREE
object which is a composite TREE object of both of its PARENT TREE
objects ( But all BLOBs in the resulting TR
William Hubbs wrote:
> I think I understand what he's asking for...
>
> I think he is asking the question, "What changed in commit ".
>
> If you use the hash of a merge commit with "git show", you get nothing,
> so the merge commit is useless in terms of following changes.
I have explained why
On 6 July 2015 at 07:15, William Hubbs wrote:
> If you use the hash of a merge commit with "git show", you get nothing, so
> the merge commit is useless in terms of following changes.
git show -m
--
Kent
KENTNL - https://metacpan.org/author/KENTNL
On Mon, Jul 6, 2015 at 2:15 AM, William Hubbs wrote:
> On Sun, Jul 05, 2015 at 07:17:26PM +0400, Jason Zaman wrote:
>> On Sun, Jul 05, 2015 at 12:03:29PM +0700, C Bergström wrote:
>> > On Sun, Jul 5, 2015 at 11:31 AM, Duncan <1i5t5.dun...@cox.net> wrote:
>> > > C Bergström posted on Sun, 05 Jul 20
On Sun, Jul 05, 2015 at 07:17:26PM +0400, Jason Zaman wrote:
> On Sun, Jul 05, 2015 at 12:03:29PM +0700, C Bergström wrote:
> > On Sun, Jul 5, 2015 at 11:31 AM, Duncan <1i5t5.dun...@cox.net> wrote:
> > > C Bergström posted on Sun, 05 Jul 2015 01:17:41 +0700 as excerpted:
> > >
> > >> I super don't
On Sun, Jul 05, 2015 at 12:03:29PM +0700, C Bergström wrote:
> On Sun, Jul 5, 2015 at 11:31 AM, Duncan <1i5t5.dun...@cox.net> wrote:
> > C Bergström posted on Sun, 05 Jul 2015 01:17:41 +0700 as excerpted:
> >
> >> I super don't like "merge" workflows.
> >> 1) "merge commits" are confusing at best a
On 5 July 2015 at 17:03, C Bergström wrote:
>
> Again I don't see it as "lying" - (you're still working on stuff until
> you push.. development isn't done) The ability to do micro or
> incremental commits instead of the svn's forced wait approach is the
> benefit here.
Generally its better to st
On Sun, Jul 5, 2015 at 11:31 AM, Duncan <1i5t5.dun...@cox.net> wrote:
> C Bergström posted on Sun, 05 Jul 2015 01:17:41 +0700 as excerpted:
>
>> I super don't like "merge" workflows.
>> 1) "merge commits" are confusing at best and normal tools don't display
>> and work with them as you'd always exp
C Bergström posted on Sun, 05 Jul 2015 01:17:41 +0700 as excerpted:
> I super don't like "merge" workflows.
> 1) "merge commits" are confusing at best and normal tools don't display
> and work with them as you'd always expect
git log --graph, as others have mentioned.
Works fine, at the console,
