| 1 |
On Mon, Jul 6, 2015 at 2:15 AM, William Hubbs <williamh@g.o> wrote: |
| 2 |
> On Sun, Jul 05, 2015 at 07:17:26PM +0400, Jason Zaman wrote: |
| 3 |
>> On Sun, Jul 05, 2015 at 12:03:29PM +0700, C Bergström wrote: |
| 4 |
>> > On Sun, Jul 5, 2015 at 11:31 AM, Duncan <1i5t5.duncan@×××.net> wrote: |
| 5 |
>> > > C Bergström posted on Sun, 05 Jul 2015 01:17:41 +0700 as excerpted: |
| 6 |
>> > > |
| 7 |
>> > >> I super don't like "merge" workflows. |
| 8 |
>> > >> 1) "merge commits" are confusing at best and normal tools don't display |
| 9 |
>> > >> and work with them as you'd always expect |
| 10 |
>> > > |
| 11 |
>> > > git log --graph, as others have mentioned. |
| 12 |
>> > |
| 13 |
>> > we are not talking about the same thing. |
| 14 |
>> > |
| 15 |
>> > I want to see the "diff" - not the graph. |
| 16 |
>> > |
| 17 |
>> > svn diff -r 1234 |
| 18 |
>> > git show <hash> |
| 19 |
>> > |
| 20 |
>> > show me the "merge" commit in diff format |
| 21 |
>> |
| 22 |
>> So this isn't a good comparison. You are asking for a merge commit in |
| 23 |
>> git and a normal commit in svn. Svn can branch but it is so complicated |
| 24 |
>> that no one ever does it. If you were similarly to never ever make |
| 25 |
>> branches in git its not a huge deal. (There are not *that* many pushes |
| 26 |
>> to the tree, if you look at #gentoo-commits there is plenty of time |
| 27 |
>> between commits.) |
| 28 |
>> |
| 29 |
>> While I personally rebase almost all of my stuff, merges are important |
| 30 |
>> when taking contributions. A good example would be the main linux kernel |
| 31 |
>> tree, if Linus were to merge everything it would be incredibly difficult |
| 32 |
>> to figure anything out. |
| 33 |
> |
| 34 |
> I'm with Duncan on this. I think I understand what he's asking for... |
| 35 |
> |
| 36 |
> I think he is asking the question, "What changed in commit <hash>". |
| 37 |
> |
| 38 |
> If you use the hash of a merge commit with "git show", you get nothing, so |
| 39 |
> the merge commit is useless in terms of following changes. |
| 40 |
|
| 41 |
That comment was from me (not Duncan) |
| 42 |
|
| 43 |
I have responded to every point - 1 by 1, but the "passionate people" |
| 44 |
(most polite term I can find) haven't addressed most of the "problems" |
| 45 |
or why commit reordering is a particular problem in gentoo's typical |
| 46 |
case. |
| 47 |
-------- |
| 48 |
To avoid the ire of the bystanders - I'm out of this thread and maybe |
| 49 |
those with more tact and tolerance carry this forward. |
Archives