X-Recipient:	archive-cygwin AT delorie DOT com
DomainKey-Signature:	a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:date:from:to:subject:message-id:reply-to
	:references:mime-version:content-type:in-reply-to; q=dns; s=
	default; b=COxOa5Oniwz7WF7D3se/Y5YBZaLNlwp/mGGeW3s9W2ybs84ziqk7Y
	phrapNzNEaCrZ+XBAA4alFkkEfjrJ23q2PtgMTmFL9yrWcooWz5q5zsBjFUlpeEM
	6k46t6OYrZCauUecJVPBuA2wNTULkDgSklyatnNp1n3Qfc1iEwVWDE=
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:date:from:to:subject:message-id:reply-to
	:references:mime-version:content-type:in-reply-to; s=default;
	bh=3tyiR0xXnNnfkOuNijjPxBTzpCU=; b=nGP/qxtpJ8C9Ca4f9j4cVzvleFPN
	TwMtLuYZvas/Lw5QP9bzduQ58fdi3JEyVOH71MAOCLsO2cySvOA6CrjvsU/CqxU7
	hBVU/Uz2dv3oUmWBlzgOG35ZAVCcPWsCvqOllMbtLIbDMJ65gPreiqGmLDhSOdj6
	F4iLCeaDRGmeCSE=
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
Authentication-Results:	sourceware.org; auth=none
X-Virus-Found:	No
X-Spam-SWARE-Status:	No, score=-101.9 required=5.0 tests=AWL,BAYES_00,GOOD_FROM_CORINNA_CYGWIN,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=quickest, announcement, H*c:application
X-HELO:	drew.franken.de
Date:	Tue, 27 Jun 2017 09:56:24 +0200
From:	Corinna Vinschen <corinna-cygwin AT cygwin DOT com>
To:	cygwin AT cygwin DOT com
Subject:	Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1
Message-ID:	<20170627075624.GO6201@calimero.vinschen.de>
Reply-To:	cygwin AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
References:	<announce DOT 20170622135850 DOT GB18863 AT calimero DOT vinschen DOT de> <aa9f7721-a8c2-4b74-123d-c9003ba5189c AT gmail DOT com> <20170623182517 DOT GA4060 AT calimero DOT vinschen DOT de> <e58cc0cf-bbdb-b9ee-77f9-f7a0167c5500 AT SystematicSw DOT ab DOT ca> <20170626083139 DOT GE6201 AT calimero DOT vinschen DOT de> <c51aa1d9-6e53-a23a-9373-718f5adbb2a7 AT SystematicSw DOT ab DOT ca> <20170626164208 DOT GM6201 AT calimero DOT vinschen DOT de> <9893ac7a-7b4a-8eac-fdc2-2d3852c2a5cf AT SystematicSw DOT ab DOT ca> <19327813 DOT 20170627041623 AT yandex DOT ru>
MIME-Version:	1.0
In-Reply-To:	<19327813.20170627041623@yandex.ru>
User-Agent:	Mutt/1.8.0 (2017-02-23)

--fpolVoprVozDR81Y
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Jun 27 04:16, Andrey Repin wrote:
> Greetings, Brian Inglis!
>=20
> > Is there an option so git will download your updated source, reject my =
patched
> > source in place, and not just overwrite it?
>=20
> Assuming you have remotes in place,
>=20
> git fetch --all
> git checkout -B your-fix-branch origin/master
>=20
> .. make your changes ...
>=20
> git format-patch origin/master

Good advice.  Git always has multiple ways to do stuff, but this
is a pretty condensed one.

Personally I'm using a slower variation motst of the time:

  $ git checkout master
  $ git pull
  $ git checkout -b my-patch-branch
  [hack, hack, hack]
  $ git commit
  $ git format-patch -1

If the hacking takes longer I want to update my branch to the latest
upstream master:

  $ git checkout master
  $ git pull
  $ git checkout my-patch-branch
  $ git rebase [-i] master
  [more hacking]
  [...]

It's not the quickest way to handle stuff, but it's a massive
progress from CVS...


Corinna

--=20
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

--fpolVoprVozDR81Y
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJZUg+oAAoJEPU2Bp2uRE+ggYkP/j4KBvBM5kt7F6/+YwTv8O+z
FPih6ZjJibXa5q675Lxf3BJpe61+dQXwa1ClUcg4VNCMOK1mYzGlmsGDwQA2Z1lh
q8Masqrxx3+lbBlvN0F2kBm6IQzxq/aahMbC95TBcniefsdr21K/PzVATjPGGSFx
PBbfI/O7eBtMKnLddXHC4kSF9SrIoDlNUlkJ1+oi6vIE6QgcCc1WgGULg459ooLm
fYngybeCE2KD7zSkKNjlrU0IF5LsoitFoh0FG2wfZ+7aqtDTpsVSl+YCEORmNQl3
+qANJXsJb6PZP/60TA7AIQ+JaEsrVVFup0jK0hCySK84cCpDGE1IvQxO5bVw1/II
3LoF03DQw0qgFgxQ4lKKU0zkXiF6jIsRw5JRsORpmdKOguDrOqMTP7mrkaqBO1+t
CaVu04pvyWFvGy6GZCrr/ZeGfXAzPB0fzdp2MFrw6+ZvorwbvHXM+5EjG8rG2/Kr
XWoVshCBcbv1whkiopg7dNkbExm0JXXHupmuW13QRx+F9Aa00DsSE1epZ73K8hKQ
2u5p7JhW0QU3UWEZ5KMO9YNwvwySxlHeiEds4LaorQNLxeR8hM5zXvVQpVfxXK8F
CZlTaj65WIRtd2ZT4FX7y1zFu3LsBQb0PA2vKqg+WUHYYtch1BMEaCN+j1iqsgJu
e5liVtNVFeOkmlzOyqrO
=qu0d
-----END PGP SIGNATURE-----

--fpolVoprVozDR81Y--

- Raw text -