From mboxrd@z Thu Jan  1 00:00:00 1970
From: Larsen <larsen007@web.de>
To: development@lists.ipfire.org
Subject: Re: Bug #10918 was: [ANNOUNCE] Good First Bugs
Date: Mon, 19 Oct 2015 22:01:10 +0200
Message-ID: <op.x6rq78htcahio0@honk.fritz.box>
In-Reply-To: <DUB406-EAS3422FCE33A5F4D4F67731149C3A0@phx.gbl>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1146702417516102474=="
List-Id: <development.lists.ipfire.org>

--===============1146702417516102474==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

> 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

--===============1146702417516102474==--