Re: [udig-devel] git diff and

[Jody Garnett <jody.garnett@xxxxxxxxx>]

Git clear was mentioned on that page: http://drupal.org/node/707484

Thanks for reviewing the patch; do you want to commit? Or since Patrick has commit access you could ask him to (with the modification you mentioned).

Jody

On 21/01/2011, at 4:47 PM, andrea antonello wrote:

> Hi Patrick, I run the patch and it looks fine to me. Thanks for this,
> I really like it. At least now it is of some use also to users :)
> 
> Just for the eyecandy, if you could add some margin to the upper
> textframe, that would then look awesome. Right now the letters get
> sticked to the borders. This is really only cosmetics.
> 
> And Jody, regarding the workflow, where did you get: git clear? As
> much as I would love to have it, there is no clear option on my git, I
> have to do: git reset --hard to achieve that.
> 
> Ciao
> Andrea
> 
> 
> On Fri, Jan 21, 2011 at 6:11 AM, Patrick Jessup
> <Patrick.Jessup@xxxxxxxxxxxx> wrote:
>> I have attached a patch to the following bug report:
>> http://jira.codehaus.org/browse/UDIG-1744. If someone wouldn’t mind
>> reviewing it, that would be great.
>> 
>> 
>> 
>> Thanks,
>> 
>> 
>> 
>> Patrick
>> 
>> 
>> 
>> From: Jody Garnett [mailto:jody.garnett@xxxxxxxxx]
>> Sent: Friday, 21 January 2011 12:27 PM
>> To: User-friendly Desktop Internet GIS
>> Cc: Patrick Jessup
>> Subject: git diff and
>> 
>> 
>> 
>> Patrik is a new lisasoft employee (welcome Patrick) who introduced himself
>> last week.
>> 
>> 
>> 
>> One of the questions we both had as he was working
>> on http://jira.codehaus.org/browse/UDIG-1744 was how to handle patches with
>> git.
>> 
>> 
>> 
>> I am sure this will all become second nature; however here is the
>> instructions we hunted down: http://drupal.org/node/707484
>> 
>> 
>> 
>> It seems to be:
>> 
>> 1) git rebase to merge with the latest
>> 
>> 2) git add for each file you want to include in your patch
>> 
>> 3) git diff > udig-1744.patch
>> 
>> 
>> 
>> And then the usual:
>> 
>> 4) git clear to undo all changes and move on to the next patch
>> 
>> 
>> 
>> 
>> 
>> 
>> 
>> ________________________________
>> The contents of this email are confidential and may be subject to legal or
>> professional privilege and copyright. No representation is made that this
>> email is free of viruses or other defects. If you have received this
>> communication in error, you may not copy or distribute any part of it or
>> otherwise disclose its contents to anyone. Please advise the sender of your
>> incorrect receipt of this correspondence.
>> 
>> _______________________________________________
>> User-friendly Desktop Internet GIS (uDig)
>> http://udig.refractions.net
>> http://lists.refractions.net/mailman/listinfo/udig-devel
>> 
>> 
> _______________________________________________
> User-friendly Desktop Internet GIS (uDig)
> http://udig.refractions.net
> http://lists.refractions.net/mailman/listinfo/udig-devel