This is the mail archive of the
cygwin
mailing list for the Cygwin project.
Re: [ANNOUNCEMENT] TEST RELEASE: Cygwin 2.8.1-0.1
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