Re: starting off

From: Santi Béjar <sbejar@gmail.com>
Date: May 7, 2008, 13:00 UTC
Message-ID: <8aa486160805070600v5d7b3d2eqce5ee893d0016148@mail.gmail.com>
In-Reply-To: <loom.20080507T121321-885@post.gmane.org>

On Wed, May 7, 2008 at 2:17 PM, Matt Davies <mjdavies@glam.ac.uk> wrote:

Show 5 quoted lines

> Hello everyone
>
>  I'm as new as new can be so please be gentle.
>
>  git version 1.5.4.5

Can you remove the double spacing?

Show 12 quoted lines

>
>  I'm following the peepcode tutorial peepcode-015-git.mov
>
>  I've created a branch, and now we're trying to use
>
>  rebase to 'watch' the master branch from the new branch.
>
>  When I run the rebase command from the other branch
>
>  I get these types of warnings/errors
>
>  http://pastie.caboo.se/192951

Why a link? Paste this inside the mail, this way the mail is self consistent, the others do not have to go to this site and can quote it.

>
>  Can someone explain to me what's happening here and if I
>
>  should be worried about it?

Some of the patches introduced lines with trailing whitespaces, git apply warns about it. You can remove the warnings setting the config "apply.whitespace" to nowarn, or you can remove them or get used to.

The final result was OK? what you expected? Did it keept the trailing whitespaces?

You can try rebase with different --whitespaces=<nowarn|warn|fix|error|error-all>

Show 9 quoted lines

>
>  If I should be worried about it
>
>  can anyone point me in the direction of some
>
>  documentation of a good (easy)way
>
>  to remove the whitespace?
>

git rebase --whitespace=fix

At least 1.5.5

Show 5 quoted lines

>  Thanks everyone.
>
>  PS, I do check the archives and found this from yesterday
>
>  http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=81336

It's a long mail...

Santi