Re: Help with git/wip

[Hauke Fath <hf%spg.tu-darmstadt.de@localhost>]

On Wed, 26 Jul 2017 13:53:27 +0000, Benny Siegert wrote:
> There are two answers for your case:
> 
> (A) Work in your own branch, then use "git cherry-pick" to move a commit to
> the branch tracking the origin. You can pull into your master
> 
> (B) stash any changes before you pull, I.e.
> Git stash
> Git pull -r
> Git push
> Git unstash (or whatever the command is)

Sure. Except I did not have to perform either set of gyrations with CVS.

Cheerio,
hauke

-- 
     The ASCII Ribbon Campaign                    Hauke Fath
()     No HTML/RTF in email            Institut für Nachrichtentechnik
/\     No Word docs in email                     TU Darmstadt
     Respect for open standards              Ruf +49-6151-16-21344