Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 20, 2005, 21:03 UTC
- Message-ID
- <20050420210330.GD19112@pasky.ji.cz>
- In-Reply-To
- <20050420205633.GC19112@pasky.ji.cz>
Dear diary, on Wed, Apr 20, 2005 at 10:56:33PM CEST, I got a letter where Petr Baudis <pasky@ucw.cz> told me that...
> cg pull will now always only pull, never merge. > > cg update will do pull + merge.
Note that what you will probably do _most_ by far is cg update. You generally do cg pull only when you want to make sure you have the latest and greatest when doing some cg diff or whatever, or on your notebook when getting on an airplane. And you do direct cg merge generally only on the airplane.
I also forgot one last usage change:
cg fork BNAME BRANCH_DIR [COMMIT_ID] -> cg fork BRANCH_DIR [BNAME] [COMMIT_ID]
This will bring its usage in sync to both cg export and cg tag. The branch name will also default to the last element in the BRANCH_DIR path (that annoyed me a lot, basically writing a thing two times at single line).
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor