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:reply-to:subject:to:references:from:message-id
	:date:mime-version:in-reply-to:content-type
	:content-transfer-encoding; q=dns; s=default; b=Ivi96KGd5NqTRgnb
	Zn5GmLMfNUT+OVUfUSt2QPbv/vR/yKj9unCgUGSIdHz/xEduvHBSlrC7FJalmR2J
	4SV56z2swOdJfJGTw6km8s0xiOwgq4YBNV6vUUtU+jfY/tscdImQAq9EazeyFbmA
	hD/oBC7i77yQGpb+MbhqGvqJXbY=
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:reply-to:subject:to:references:from:message-id
	:date:mime-version:in-reply-to:content-type
	:content-transfer-encoding; s=default; bh=0TmeYq0QdImcBjkiZx6rhK
	0AxTU=; b=tdKfjgOWURGktjy4PrpCZP18hsYtZ8AS78+BSQzDp/upptOVZ4xDZ/
	WEjvRfaSNXOddKvSKUgol+8A0hifnirbX5p/1mvnmA5QJt4Fdu6cwyGcgf0KdPBy
	/pRAF7ah5HSh/IzCPKbnM6t01X+SbKTV2Qe+njmTzJvT7SgEzM8cg=
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=-1.9 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=granular, gotta, fingers, announcement
X-HELO:	smtp-out-no.shaw.ca
X-Authority-Analysis:	v=2.2 cv=a+JAzQaF c=1 sm=1 tr=0 a=MVEHjbUiAHxQW0jfcDq5EA==:117 a=MVEHjbUiAHxQW0jfcDq5EA==:17 a=IkcTkHD0fZMA:10 a=FpnKJlAubjZyDJpsCXkA:9 a=QEXdDO2ut3YA:10
Reply-To:	Brian DOT Inglis AT SystematicSw DOT ab DOT ca
Subject:	Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1
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> <20170627075624 DOT GO6201 AT calimero DOT vinschen DOT de>
From:	Brian Inglis <Brian DOT Inglis AT SystematicSw DOT ab DOT ca>
Message-ID:	<58606f41-68f7-a157-3108-e6ce46443eb1@SystematicSw.ab.ca>
Date:	Tue, 27 Jun 2017 12:53:30 -0600
User-Agent:	Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1
MIME-Version:	1.0
In-Reply-To:	<20170627075624.GO6201@calimero.vinschen.de>
X-CMAE-Envelope:	MS4wfHPSPeUkwHOfePGIyaSlqksgB9SznCcHVufHH3IgeDrSK+970r4rlhxOBZkmR1av7tlCEtFOhosoBPqExfo7PSLw/KFAqxvqNLfhxQJPdm6d+ZmQnvFl rqv16LR+4R1CGnIMiPhiWz32zuAnvwEyikWNsIxeZxFYIHAy6xpPvuVeUIC0pbgx+9qL3BbBS6Md9w==
X-IsSubscribed:	yes

On 2017-06-27 01:56, Corinna Vinschen wrote:
> On Jun 27 04:16, Andrey Repin wrote:
>>> Is there an option so git will download your updated source, 
>>> reject my patched source in place, and not just overwrite it?
>> Assuming you have remotes in place,
>> git fetch --all
>> git checkout -B your-fix-branch origin/master
>> .. make your changes ...
>> 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...

Thanks - I'll save those hints for git workflow and use in future.

Nearly always forget the branch part: gotta retrain my fingers
to add the appropriate branch commands for the source control
products I use, and do more granular commits instead of big bangs.

Even your slower variation is still faster than simple ops were
on smaller CVS repos, and more reliable from reports, although
I never had any local or remote corruption problems with CVS.

-- 
Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -