threads / discuss / 13414

starting off

Subject: starting off

## tl;dr

3 messages between May 7, 2008 and May 7, 2008.

replies: 2people: 2as markdown or json

Matt Davies· May 7, 2008, 12:17 UTC · lore

Hello everyone

I'm as new as new can be so please be gentle.

git version 1.5.4.5

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

Can someone explain to me what's happening here and if I

should be worried about it?

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?

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

Does that mean that if I update my git this problem will be resolved?

Sorry for being so naive, I wont be for long (hopefully)

Santi Béjar· May 7, 2008, 13:00 UTC · re: Matt Davies · lore

Re: starting off

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

matt davies· May 7, 2008, 13:24 UTC · re: Santi Béjar · lore

Re: starting off

Hi Santi, thanks for getting back to me.

> Can you remove the double spacing?

I've accidentally posted twice, the first post was me emailing my question in. That took so long to appear that I then reposted using this site. http://permalink.gmane.org/gmane.comp.version-control.git/81433

Posting on that site only allows lines with 80 characters in, so I had to press enter at the end of every line so that it would post.

>> 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.

Same reason as above.

> git rebase --whitespace=fix

I'm going to update my git and give that a go, also, I'll only send emails into the list from now on.

On 7 May 2008, at 14:00, Santi Béjar wrote:

Show 65 quoted lines

> On Wed, May 7, 2008 at 2:17 PM, Matt Davies <mjdavies@glam.ac.uk>  
> wrote:
>> 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?
>
>>
>> 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>
>
>>
>> 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
>
>> 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