Re: some git usage related queries

[Alexander Polakov <polachok@xxxxxxxxx>]

2009/11/9, Peter Avalos <pavalos@theshell.com>:
> On Mon, Nov 09, 2009 at 09:17:58AM +0530, Saifi Khan wrote:
>> While studying the recent commits related to mandoc(1), there
>> are two very similar commits:
>>
>> 1. Sascha's mandoc(1) commits (Nov 7)
>>    54 files changed, 1349 insertions(+), 730 deletions(-)
>>
>> http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d
>>
>> 2. Alexander's mandoc(1) commits (Nov 8)
>>    54 files changed, 1349 insertions(+), 730 deletions(-)
>>
>> http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714
>>
>> How do i see what are the changes between the two ?
>>
>
> git diff
> 0dd4f1472251d685486367a185d3b9d78062f84d..32c903ac153404697d03cdf54825a041b54dd714
>
> I'm not sure what Alexander did to cause that.  Was there a git push -f
> involved?

No git push -f was involved. Maybe the reason is 'rebase -i' I did on
newacpi+ branch, I didn't touch or reorder commit but it appeared on
the list once :/ Looks like merge is not completely safe to use. Sorry
for that.