Re: [AMBER-Developers] git logs and squashing commits

From: Hai Nguyen <nhai.qn.gmail.com>
Date: Wed, 24 Feb 2016 13:43:21 -0500

in case for anyone does not know:

you can use j for move down and k to move up when using 'git log -p --color
somefile'

Hai

On Wed, Feb 24, 2016 at 1:41 PM, Hai Nguyen <nhai.qn.gmail.com> wrote:

> alternatively,
>
> you can try
>
> type*: git log --color -p amber.bib*
> then search keyword amber.bib by typing:* /amber.bib*
> to repeat the search, press* 'n'*
> (similar to vim)
>
> tag "*-p*" will show the modified content
>
> Hai
>
> On Wed, Feb 24, 2016 at 12:31 PM, Timothy J Giese <timothyjgiese.gmail.com
> > wrote:
>
>> There is a gui called "gitk" that is sometimes useful.
>>
>> Open gitk, then
>> next to "Find",
>> select "touching paths:"
>> and then enter the name of the file;
>> e.g., AmberTools/src/sander/multisander.F90
>>
>> Then the arrow buttons next to "Find" will skip up and down through
>> those commits that edit that file.
>>
>> -Tim
>>
>> On 02/24/2016 12:22 PM, David A Case wrote:
>> > I'm pinging git experts about what (if anything) we can do with the
>> following
>> > problem:
>> >
>> > If I cd to the amber14/doc directory and type "git log amber.bib" (in
>> order
>> > to find recent changes to this file), I get the following:
>> >
>> > commit acc59a342da64bf949ac6828b45294b275970344
>> > Author: Hai Nguyen <hainm.comp.gmail.com>
>> > Date: Thu Feb 4 11:02:31 2016 -0500
>> >
>> > Squashed commit of the following:
>> >
>> > commit 689f1f003ea81f51a26f4791e46ed9fa18ee8b5e
>> > Merge: 8a40ed6 9c3c6ef
>> > Author: Hai Nguyen <hainm.users.noreply.github.com>
>> > Date: Thu Feb 4 01:50:52 2016 -0500
>> >
>> > Merge pull request #1136 from hainm/master
>> >
>> > add ref_mask for rmsd
>> >
>> > commit 9c3c6ef39bd1c4a45308733b54439dde4d7f3edf
>> > Author: Hai Nguyen <hainm.comp.gmail.com>
>> > Date: Thu Feb 4 01:40:16 2016 -0500
>> >
>> > fix
>> >
>> >
>> > ...etc...etc for hundreds of commit logs, (7500 lines of text) almost
>> none
>> > of which actually did anything to amber.bib itself.
>> >
>> > I can redirect the output to a file, and use a text editor to try to
>> find
>> > what I'm looking for, but I wonder if there is not a better way. Do we
>> really
>> > need commits that are thousands of lines long? Is there a better way to
>> > maintain a useful history? Some fancy option to the "git log" command
>> that
>> > alleviates this?
>> >
>> > ...thx...dac
>> >
>> > _______________________________________________
>> > AMBER-Developers mailing list
>> > AMBER-Developers.ambermd.org
>> > http://lists.ambermd.org/mailman/listinfo/amber-developers
>> >
>>
>>
>> _______________________________________________
>> AMBER-Developers mailing list
>> AMBER-Developers.ambermd.org
>> http://lists.ambermd.org/mailman/listinfo/amber-developers
>>
>
>
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Wed Feb 24 2016 - 11:00:05 PST
Custom Search