tech-pkg archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
Re: Help with git/wip
On 2017年7月26日 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
Home |
Main Index |
Thread Index |
Old Index