From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 125948 invoked by alias); 27 Jun 2017 18:53:36 -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 123200 invoked by uid 89); 27 Jun 2017 18:53:35 -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=granular, gotta, fingers, announcement X-HELO: smtp-out-no.shaw.ca Received: from smtp-out-no.shaw.ca (HELO smtp-out-no.shaw.ca) (64.59.134.9) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 18:53:34 +0000 Received: from [192.168.1.100] ([24.64.240.204]) by shaw.ca with SMTP id PvcAdeWvvM9gtPvcBd5tmH; Tue, 27 Jun 2017 12:53:32 -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=FpnKJlAubjZyDJpsCXkA:9 a=QEXdDO2ut3YA:10 Reply-To: Brian.Inglis@SystematicSw.ab.ca Subject: Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1 To: cygwin@cygwin.com 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> <20170627075624.GO6201@calimero.vinschen.de> From: Brian Inglis Message-ID: <58606f41-68f7-a157-3108-e6ce46443eb1@SystematicSw.ab.ca> Date: Tue, 27 Jun 2017 18:53: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: <20170627075624.GO6201@calimero.vinschen.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfHPSPeUkwHOfePGIyaSlqksgB9SznCcHVufHH3IgeDrSK+970r4rlhxOBZkmR1av7tlCEtFOhosoBPqExfo7PSLw/KFAqxvqNLfhxQJPdm6d+ZmQnvFl rqv16LR+4R1CGnIMiPhiWz32zuAnvwEyikWNsIxeZxFYIHAy6xpPvuVeUIC0pbgx+9qL3BbBS6Md9w== X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg00361.txt.bz2 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