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=
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com
Reply-To: Brian.Inglis@SystematicSw.ab.ca
Subject: Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1
To: cygwin@cygwin.com
References: <announce.20170622135850.GB18863@calimero.vinschen.de> <aa9f7721-a8c2-4b74-123d-c9003ba5189c@gmail.com> <20170623182517.GA4060@calimero.vinschen.de> <e58cc0cf-bbdb-b9ee-77f9-f7a0167c5500@SystematicSw.ab.ca> <20170626083139.GE6201@calimero.vinschen.de> <c51aa1d9-6e53-a23a-9373-718f5adbb2a7@SystematicSw.ab.ca> <20170626164208.GM6201@calimero.vinschen.de> <9893ac7a-7b4a-8eac-fdc2-2d3852c2a5cf@SystematicSw.ab.ca> <19327813.20170627041623@yandex.ru> <20170627075624.GO6201@calimero.vinschen.de>
From: Brian Inglis <Brian.Inglis@SystematicSw.ab.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>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit

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