Re: cogito - how do I ???
- From
- Frank Sorenson <frank@tuxrocks.com>
- Date
- May 22, 2005, 05:27 UTC
- Message-ID
- <42901840.5080002@tuxrocks.com>
- In-Reply-To
- <2765.10.10.10.24.1116713164.squirrel@linux1>
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Sean wrote:
Show 19 quoted lines
> On Sat, May 21, 2005 5:47 pm, Sam Ravnborg said: > >>Hi all. >> >>While trying to get up to speed on cogito/git I stumbled across >>a few things that I at least did not find available in cogito. >> >>1) Something similar to "bk changes -R". I use this to see what has >>happened upstream - to see if I really want to merge stuff. > > > Not sure what bk did here, but you can do something like: > > cg-pull origin > cg-log -c -r origin > > To see what is at the head of the unmerged objects you just pulled down, > and if you want to merge then "cg-merge origin". Although as far as I > know there's no way to have the log stop automatically at the proper spot.
Here's what I use:
cg-log -c -f -r :origin
- -c = colorize the output - -f = list files affected - -r :origin = only display this range (equivalent to "-r HEAD:origin")
Frank - -- Frank Sorenson - KD7TZK Systems Manager, Computer Science Department Brigham Young University frank@tuxrocks.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFCkBhAaI0dwg4A47wRAtrdAJ9Hy/H4BNurGd+Ukjtz+0+6sUDIkgCdHJIr KnponX5ITXEDe/r+0dAOmqc= =jaNR -----END PGP SIGNATURE-----