From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23958 invoked by alias); 27 Jun 2017 07:56:30 -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 23943 invoked by uid 89); 27 Jun 2017 07:56:29 -0000 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 Received: from mail-n.franken.de (HELO drew.franken.de) (193.175.24.27) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 07:56:28 +0000 Received: from aqua.hirmke.de (aquarius.franken.de [193.175.24.89]) (Authenticated sender: aquarius) by mail-n.franken.de (Postfix) with ESMTPSA id 9B9BE721E280D for ; Tue, 27 Jun 2017 09:56:25 +0200 (CEST) Received: from calimero.vinschen.de (calimero.vinschen.de [192.168.129.6]) by aqua.hirmke.de (Postfix) with ESMTP id E89AD5E0389 for ; Tue, 27 Jun 2017 09:56:24 +0200 (CEST) Received: by calimero.vinschen.de (Postfix, from userid 500) id C57F0A805FC; Tue, 27 Jun 2017 09:56:24 +0200 (CEST) Date: Tue, 27 Jun 2017 07:56:00 -0000 From: Corinna Vinschen To: cygwin@cygwin.com Subject: Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1 Message-ID: <20170627075624.GO6201@calimero.vinschen.de> Reply-To: cygwin@cygwin.com Mail-Followup-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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fpolVoprVozDR81Y" Content-Disposition: inline In-Reply-To: <19327813.20170627041623@yandex.ru> User-Agent: Mutt/1.8.0 (2017-02-23) X-SW-Source: 2017-06/txt/msg00357.txt.bz2 --fpolVoprVozDR81Y Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 1124 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" Content-length: 819 -----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--