bug-wget
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-wget] [PATCH] replaced read_whole_file() by getline()


From: Tim Rühsen
Subject: Re: [Bug-wget] [PATCH] replaced read_whole_file() by getline()
Date: Tue, 14 May 2013 21:42:53 +0200
User-agent: KMail/1.13.7 (Linux/3.8-1-amd64; KDE/4.8.4; x86_64; ; )

Thank you and Angel for your answers.

Am Dienstag, 14. Mai 2013 schrieb Daniel Stenberg:
> On Tue, 14 May 2013, Tim Rühsen wrote:
> 
> > But now that I made all the requested changes to my working tree, how do I 
> > make a diff to some commit back in time or to upstream ? Especially with 
git 
> > format-patch ? Locally, I didn't create my own branch, so i am on master. 
(I 
> > have to read a git book someday...)
> 
> 'git commit --amend [files]'
> 
> ... to update your (most recent) commit. Then you can git format-patch again 
> and resend.
> 
> But yes, working on stuff like this in your own local branch is often a 
better 
> idea if you ask me...

Maybe it is a good idea since (at least i hope so) with an own branch you can 
still 'git pull' without conflicts while having own commits in the other 
branch. Have to try that out.

I didn't know how to amend one of the earlier commits.

Than I encountered 'git branch -a':
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/origin/parallel-wget

This let me try out 'git diff remotes/origin/master master'.
I piped the output into a file and hand-removed the unrelevant changes.

Not very elegant but should work.

Regards, Tim



reply via email to

[Prev in Thread] Current Thread [Next in Thread]