Re: [smarthome-dev] Merge strategy

[Markus Rathgeb <maggu2810@xxxxxxxxx>]

Using the command line to show the information:

$ git show 1fdce56a2d17a6e01c2ee09cc6f15d58e4b7510a

===
commit 1fdce56a2d17a6e01c2ee09cc6f15d58e4b7510a
Author: Markus Rathgeb <maggu2810@xxxxxxxxx>
Date:   Tue Apr 5 10:13:38 2016 +0200

    Test

    * add empty file
    * add content

    Signed-off-by: Markus Rathgeb <maggu2810@xxxxxxxxx>

diff --git a/test b/test
new file mode 100644
index 0000000..257cc56
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+foo
===

I am the author and you have merged, I think it is okay to see which
person merged the commit.

2016-04-05 10:14 GMT+02:00 Kai Kreuzer <kai@xxxxxxxxxxx>:
> The commit now shows
>
> "maggu2810 committed with kaikreuzer"
>
> But it also shows my avatar next to the commit...
>
>> On 05 Apr 2016, at 10:13, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
>>
>> Hi Kai,
>> I would expect that this follows the normal Git behaviour.
>> But please test it and merge this one (using squash + merge):
>> https://github.com/maggu2810/test-merge/pull/1
>>
>> 2016-04-05 10:05 GMT+02:00 Kai Kreuzer <kai@xxxxxxxxxxx>:
>>> Who is the author of the squashed commit? The person that merges (and edits the comment) or the original author?
>>>
>>>> On 05 Apr 2016, at 10:01, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
>>>>
>>>> Have a look at: https://github.com/maggu2810/smarthome/pull/1
>>>> The two commits has been merged here:
>>>> https://github.com/maggu2810/smarthome/commit/e3d116a2a784a88814baf86ca0b36778dfd03100
>>>>
>>>> The commit messages are added all in the editable text box.
>>>> So the one that merge the commits, can combine all the messages
>>>> (create one message of the multiple ones), no Also-by and
>>>> Signed-off-by gets lost (except the merger does edit the message and
>>>> removes them).
>>>> _______________________________________________
>>>> smarthome-dev mailing list
>>>> smarthome-dev@xxxxxxxxxxx
>>>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>>>> https://dev.eclipse.org/mailman/listinfo/smarthome-dev
>>>
>>> _______________________________________________
>>> smarthome-dev mailing list
>>> smarthome-dev@xxxxxxxxxxx
>>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>>> https://dev.eclipse.org/mailman/listinfo/smarthome-dev
>> _______________________________________________
>> smarthome-dev mailing list
>> smarthome-dev@xxxxxxxxxxx
>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>> https://dev.eclipse.org/mailman/listinfo/smarthome-dev
>
> _______________________________________________
> smarthome-dev mailing list
> smarthome-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/smarthome-dev