From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 51456 invoked by alias); 27 Jun 2017 05:33:24 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Received: (qmail 51443 invoked by uid 89); 27 Jun 2017 05:33:23 -0000 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=diy, DIY, cloud, CVS X-HELO: smtp-out-no.shaw.ca Received: from smtp-out-no.shaw.ca (HELO smtp-out-no.shaw.ca) (64.59.134.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 05:33:22 +0000 Received: from [192.168.1.100] ([24.64.240.204]) by shaw.ca with SMTP id Pj7ndaaX7M9gtPj7od42FQ; Mon, 26 Jun 2017 23:33:20 -0600 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=o4-6mzOL36if6kgjSQMA:9 a=QEXdDO2ut3YA:10 Reply-To: Brian.Inglis@SystematicSw.ab.ca Subject: Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1 References: <20170623182517.GA4060@calimero.vinschen.de> <20170626083139.GE6201@calimero.vinschen.de> <20170626164208.GM6201@calimero.vinschen.de> <9893ac7a-7b4a-8eac-fdc2-2d3852c2a5cf@SystematicSw.ab.ca> <19327813.20170627041623@yandex.ru> To: cygwin@cygwin.com From: Brian Inglis Message-ID: <57d2c3f8-8ec7-693b-adab-4615a539e5fe@SystematicSw.ab.ca> Date: Tue, 27 Jun 2017 05:33:00 -0000 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: <19327813.20170627041623@yandex.ru> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfIRb2QRx3NSwgJ0a75CydkHFoLKLrHdma9XuQHwST2uLPe9wMAkowq4CJnP3+Ijsv9lzGu405Ndo9mUOD126Zmp38ahD7jLNsuoQIO88qygDelrfTfhq GhnG/Cjcd56xoPE3/RB4S9HVxDxNix5bSNikEOBcE27SagvDwaVl4DGkhM4LRrjmqRTUzLB0dYsGTQ== X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg00354.txt.bz2 On 2017-06-26 19: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 Thanks Andrey, I forget about branches, being used to DIY with only mainline changes. Sometimes I had to beg for access to use source control, or download and install RCS, CVS, Hg to use myself where policy did not disallow that. Even where source control was used, it was often either the MS product or CVS with tags, nothing more modern was supported. I know some large corps rely on FS logs/journals or snapshots, where source control lags cloud adoption and use. -- 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