Git merge commit log

[Justin Obara]

Thanks Michelle,

I think this is really good too. I had tried to see if we could also  get the commit hashes to show up, but I couldn't find a way. One thing to note, unless you are using the latest version of git, 1.7.4 I think, then it will only show you a maximum of 20 commits. That should be good enough for most of the time, but if there are more, in the latest version you can call it like "git merge --log=47" where 47 is the number of commits to show.

Thanks
Justin

On 2011-03-10, at 3:43 PM, Antranig Basman wrote:

> Yes, I think this flag is great, thanks for digging it out
> 
> On 10/03/2011 12:24, Michelle D'Souza wrote:
>> Hi,
>> 
>> I merged and pushed the FLUID-4044 branch today and I was wondering whether people liked the results of using the --log flag. You'll notice if you take a look at the commit log that it has the one line commit messages for every commit that was merged. This might help to communicate quickly what was merged in at a particular merge point. Here's what it looks like:
>> 
>> commit 6260c214c4a77f01c6ee52dfe827a63b9c9d5e74
>> Merge: 8c4ab1a 89019d7
>> Author: Michelle D'Souza<michelled33 at gmail.com>
>> Date:   Thu Mar 10 14:03:03 2011 -0500
>> 
>>     Merge remote branch 'gchowdhury/FLUID-4044'
>> 
>>     * gchowdhury/FLUID-4044:
>>       FLUID-4044: refactored some more of the codes for inline-edit unit tests.
>>       FLUID-4044: cleaned the inline-edit unit test codes with jslint and refactored some more of the codes.
>>       FLUID-4044: cleaned the inline-edit unit test code with jslint and refactored some of the code.
>>       FLUID-4044: cleaned the inline-edit unit test code as per code reviewer recomendation.
>>       FLUID-4044: cleaned the inline-edit unit test code as per Jslint recomendation.
>>       FLUID-4044: Conversion of the manual test cases to automated test cases.
>> 
>> 
>> 
>> Without the --log flag we would only have got the first line of the message not the details below. Which do you like better?
>> 
>> Michelle
> _______________________________________________________
> fluid-work mailing list - fluid-work at fluidproject.org
> To unsubscribe, change settings or access archives,
> see http://fluidproject.org/mailman/listinfo/fluid-work