Hello Larsen, Thanks again for guidelines,just one question more, what command/GUI output you use to make correct patch diff output on Windows?
I used command git diff a/file.txt b/file.txt but it returned error.
Poslano s mog Windows Phonea ________________________________ Šalje: Larsenmailto:larsen007@web.de Poslano: 19.10.2015. 20:36 Prima: development@lists.ipfire.orgmailto:development@lists.ipfire.org Predmet: Re: Bug #10918 was: [ANNOUNCE] Good First Bugs
If you could send me those notes, or even update it on wiki, it would be great benefit.
Here you go:
== Send in a patch == * Thunderbird > Compose new mail * Options > Enable Word Wrap: disable * Recipient: development@lists.ipfire.org development@lists.ipfire.org * Subject: [PATCH] <text> * Body: First line contains a short description of the patch.
After a blank line, a more precise description follows (if needed; you can leave that out for smaller patches). Optionally together with a "Fixes bug <number>" in case the patch fixes a bug
Signed-off-by: Your Name your@email.adress ---
* After the "---" and blank line you put the patch as plain text * Having sent the mail to the list, you can check http://patchwork.ipfire.org/project/ipfire/list * In case there is a corresponding bug in the bugtracker, you should add a note there with the URL to the patch
Thanks again for guidelines,just one question more, what command/GUI output you use to make correct patch diff output on Windows?
== Create a patch == * Activate your local feature branch * Rebase, when the remote branch has been updated inbetween: * Right-click on the folder where the IPFire-code is located * TortoiseGit > Rebase... * Branch: Your local feature branch * Upstream: next * Select the newest ID and start the rebase * Right-click on the folder where the IPFire-code is located * TortoiseGit > Revision graph * Select the block "next - origin/next" * While holding the ctrl-key select your local feature branch * Right-click > Unified diff * Ctrl+Shift+S to save the patch to a file
Not 100% sure about the rebase procedure, but has been working till then =)
hth, Lars