git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Frank Sorenson <frank@tuxrocks.com>
To: Sean <seanlkml@sympatico.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>, git@vger.kernel.org
Subject: Re: cogito - how do I ???
Date: Sat, 21 May 2005 23:27:28 -0600	[thread overview]
Message-ID: <42901840.5080002@tuxrocks.com> (raw)
In-Reply-To: <2765.10.10.10.24.1116713164.squirrel@linux1>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sean wrote:
> 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-----

      parent reply	other threads:[~2005-05-22  5:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-21 21:47 cogito - how do I ??? Sam Ravnborg
2005-05-21 22:06 ` Sean
2005-05-21 23:41   ` Linus Torvalds
2005-05-22  7:14     ` Sam Ravnborg
2005-05-22 16:23       ` Linus Torvalds
2005-05-23  7:19     ` Thomas Glanzmann
2005-05-23  7:40       ` Junio C Hamano
2005-05-23  8:02         ` Thomas Glanzmann
2005-05-23 14:35       ` Linus Torvalds
2005-05-23 16:34         ` Junio C Hamano
2005-05-24  2:26         ` Herbert Xu
2005-05-24  3:05           ` Linus Torvalds
2005-05-22  5:27   ` Frank Sorenson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=42901840.5080002@tuxrocks.com \
    --to=frank@tuxrocks.com \
    --cc=git@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --cc=seanlkml@sympatico.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).