Op 20-3-2012 20:35, Richard Heck schreef:
On 03/20/2012 07:44 AM, Vincent van Ravesteijn wrote:
Op 20-3-2012 0:15, Richard Heck schreef:
This is in my private repo. I have a branch master, and another
branch bugs/7975, and another branch lyx/trunk that is tracking the
main repo, set up as
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will show you that the merge is not empty at all.
Is there a way how to obtain full listing of diffs which went into
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will show you that the merge is not empty at all.
Is there a way how to obtain
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will show you that the merge is not empty at
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will
Op 21-3-2012 16:39, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code
changes
introduced by a merge
Op 21-3-2012 16:48, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:39, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you
Vincent van Ravesteijn wrote:
change that was merged in by Richard was March 13.
You can see this immediately if you limit the output to only Richard's
commits:
$ git log -p --author='Richard Heck'
Vincent
The following shows the diffs in order they got into master:
or:
git log -p
Op 20-3-2012 20:35, Richard Heck schreef:
On 03/20/2012 07:44 AM, Vincent van Ravesteijn wrote:
Op 20-3-2012 0:15, Richard Heck schreef:
This is in my private repo. I have a branch master, and another
branch bugs/7975, and another branch lyx/trunk that is tracking the
main repo, set up as
Vincent van Ravesteijn wrote:
> all commits that are in this range). If you want to see the code changes
> introduced by a merge you can do:
>
> $ git diff 9236a938 9236a938^1
>
> This will show you that the merge is not empty at all.
Is there a way how to obtain full listing of diffs which went
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will show you that the merge is not empty at all.
Is there a way how to obtain
Vincent van Ravesteijn wrote:
> Op 21-3-2012 15:00, Pavel Sanda schreef:
>> Vincent van Ravesteijn wrote:
>>> all commits that are in this range). If you want to see the code changes
>>> introduced by a merge you can do:
>>>
>>> $ git diff 9236a938 9236a938^1
>>>
>>> This will show you that the
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code changes
introduced by a merge you can do:
$ git diff 9236a938 9236a938^1
This will
Op 21-3-2012 16:39, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you want to see the code
changes
introduced by a merge
Op 21-3-2012 16:48, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:39, Vincent van Ravesteijn schreef:
Op 21-3-2012 16:16, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
Op 21-3-2012 15:00, Pavel Sanda schreef:
Vincent van Ravesteijn wrote:
all commits that are in this range). If you
Vincent van Ravesteijn wrote:
>>> change that was merged in by Richard was March 13.
>>>
>>> You can see this immediately if you limit the output to only Richard's
>>> commits:
>>>
>>> $ git log -p --author='Richard Heck'
>>>
>>> Vincent
>>
>> The following shows the diffs in order they got into
Op 20-3-2012 0:15, Richard Heck schreef:
On 03/19/2012 06:47 PM, Lars Gullik Bjønnes wrote:
Richard Heckrgh...@comcast.net writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heckrgh...@lyx.org
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit:
On 03/20/2012 07:44 AM, Vincent van Ravesteijn wrote:
Op 20-3-2012 0:15, Richard Heck schreef:
This is in my private repo. I have a branch master, and another
branch bugs/7975, and another branch lyx/trunk that is tracking the
main repo, set up as you suggested. The master and lyx/trunk
Op 20-3-2012 0:15, Richard Heck schreef:
On 03/19/2012 06:47 PM, Lars Gullik Bjønnes wrote:
Richard Heck writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heck
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit:
On 03/20/2012 07:44 AM, Vincent van Ravesteijn wrote:
Op 20-3-2012 0:15, Richard Heck schreef:
This is in my private repo. I have a branch master, and another
branch bugs/7975, and another branch lyx/trunk that is tracking the
main repo, set up as you suggested. The master and lyx/trunk
On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heckrgh...@lyx.org
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=0a0a837b70a8e4736b6b848060b6a893a8578306
Log:
Address bug 7975 by changing
Richard Heck wrote:
On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heckrgh...@lyx.org Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306 URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=0a0a837b70a8e4736b6b848060b6a893a8578306
Log: Address
Richard Heck rgh...@comcast.net writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heckrgh...@lyx.org
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
URL:
On 03/19/2012 06:47 PM, Lars Gullik Bjønnes wrote:
Richard Heckrgh...@comcast.net writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heckrgh...@lyx.org
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
URL:
On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heck
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=0a0a837b70a8e4736b6b848060b6a893a8578306
Log:
Address bug 7975 by changing
Richard Heck wrote:
> On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
>> Author: Richard Heck Date: Tue, 13 Mar 2012 12:08:25 -0400
>> New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306 URL:
>> http://git.lyx.org/?p=lyx.git;a=commit;h=0a0a837b70a8e4736b6b848060b6a893a8578306
>>
>>
Richard Heck writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
>> Author: Richard Heck
>> Date: Tue, 13 Mar 2012 12:08:25 -0400
>> New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
>> URL:
>>
On 03/19/2012 06:47 PM, Lars Gullik Bjønnes wrote:
Richard Heck writes:
| On 03/19/2012 06:04 PM, rgh...@lyx.org wrote:
Author: Richard Heck
Date: Tue, 13 Mar 2012 12:08:25 -0400
New Commit: 0a0a837b70a8e4736b6b848060b6a893a8578306
URL:
28 matches
Mail list logo