[Top][All Lists]

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

Re: [Bug-wget] [Win32 Patch] console-close events

From: Tim Ruehsen
Subject: Re: [Bug-wget] [Win32 Patch] console-close events
Date: Mon, 27 Oct 2014 10:47:40 +0100
User-agent: KMail/4.14.1 (Linux/3.16-2-amd64; KDE/4.14.1; x86_64; ; )

On Tuesday 21 October 2014 12:46:29 Gisle Vanem wrote:
> Darit, about the git format-patch. I don't know how.
> The src/Changelog entry could simply be:

After you 'git clone' you make your changes (ideally in your own branch).

You commit your changes to your local repo
        git commit -a -m "description"

Now you generate a patchfile with
        git format-patch -1
and send the resulting file to this list.
(Others would use  'git am < file.patch' to apply your patch.)

Here is what I do when someone asks me to amend a patch:
1. make the changes
2. commit them (git commit -a m "blabla")
3. merge the last two commits into one with interactive 'git rebase':
        git rebase -i HEAD~2
Your editor will open with two lines beginning with 'pick'.
Change 'pick' of line with 'blabla' to 'f' and save the file.

Of course there are (quite a few) other ways to achieve the same (e.g. you 
could undo the last commit with 'git reset').

If you are creating an own branch for each patch your are working on, you 
should be pretty clean. You can always checkout master and make a 'git pull' 
to get the latest changes from upstream.

You will find good help and many examples (for special problems one might 
have) in the internet.


Attachment: signature.asc
Description: This is a digitally signed message part.

reply via email to

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