Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git and usability

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Jaka Kranjc <lynx AT mages.ath.cx>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] git and usability
  • Date: Tue, 18 Jul 2006 14:04:24 +0200

On Tuesday 18 July 2006 13:39, Ladislav Hagara wrote:
> Seems Git Guide has not been changed from 2006-07-01.
> I would really appreciate if I could find out some kiss info about
> "integration, cherry-picking" from test (master) grimoire to stable-rc
> and stable grimoire,
git log # find the commit you want to integrate and its hash ($hash below)
git checkout stable-rc # to get to the branch you want to modify
git cherry-pick -e $hash# cherry-pick
git checkout master # to get back

Checking with the guide, this is almost exactly the same. -e permitts you to
edit the commit message.

> some info about renaming/moving files/all spells
> (something like p4 integration ...)
Don't know how it was like, but I guess you mean moving/... files between
local branches.
For moving/renaming/deleting files in one branch, you just use the standard
tools (mv, rm ...), then commit the change. Once you have done that, you can
cherry-pick that commit into other branches as mentioned above.

> and some info how to return to
> previous version (p4 sync ...@).
Again, not sure what you mean, but:
* you can revert commits with git revert $hash,
* git checkout -f to blow away all you did (not pushed commits too?),
* git reset --hard cleans your working tree - anything not commited will be
lost

I hope I didn't give any misinformation. ;)
--
We cannot command nature except by obeying her. --Sir Francis Bacon

Attachment: pgpnc3l7uIRMk.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page