From: Brian Inglis <Brian.Inglis@SystematicSw.ab.ca>
To: cygwin@cygwin.com
Subject: Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1
Date: Tue, 27 Jun 2017 18:53:00 -0000 [thread overview]
Message-ID: <58606f41-68f7-a157-3108-e6ce46443eb1@SystematicSw.ab.ca> (raw)
In-Reply-To: <20170627075624.GO6201@calimero.vinschen.de>
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
next prev parent reply other threads:[~2017-06-27 18:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 14:31 Corinna Vinschen
2017-06-23 17:53 ` Marco Atzeri
2017-06-23 18:25 ` Corinna Vinschen
2017-06-23 18:47 ` Brian Inglis
2017-06-26 8:31 ` Corinna Vinschen
2017-06-26 16:25 ` Brian Inglis
2017-06-26 16:42 ` Corinna Vinschen
2017-06-26 20:00 ` Brian Inglis
2017-06-27 1:20 ` Andrey Repin
2017-06-27 5:33 ` Brian Inglis
2017-06-27 7:56 ` Corinna Vinschen
2017-06-27 18:53 ` Brian Inglis [this message]
2017-06-27 19:05 ` Achim Gratz
2017-06-27 20:37 ` Brian Inglis
2017-06-27 7:38 ` Corinna Vinschen
2017-06-24 7:35 ` Marco Atzeri
2017-06-26 8:32 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58606f41-68f7-a157-3108-e6ce46443eb1@SystematicSw.ab.ca \
--to=brian.inglis@systematicsw.ab.ca \
--cc=cygwin@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).