qiuestion about Git and Cogito

qiuestion about Git and Cogito

[Francois Lang]

Hello. We have started using Git and Cogito, and are very happy users so 
far. There's one thing that I haven't been able to figure out, however:

Suppose I've done a bunch of commits in my local repository that I have 
not yet pushed to the remote repository. How can I determine what has 
been cg-commit-ed but not yet cg-pushe-ed WITHOUT actually doing the 
cg-push?

Many thanks in advance for your help.

Francois Lang
Senior Scientific Systems Programmer
National Library of Medicine

Re: qiuestion about Git and Cogito

[Petr Baudis]

On Tue, Mar 20, 2007 at 04:15:32PM CET, Francois Lang wrote:
> Hello. We have started using Git and Cogito, and are very happy users so 
> far. There's one thing that I haven't been able to figure out, however:
> 
> Suppose I've done a bunch of commits in my local repository that I have 
> not yet pushed to the remote repository. How can I determine what has 
> been cg-commit-ed but not yet cg-pushe-ed WITHOUT actually doing the 
> cg-push?
> 
> Many thanks in advance for your help.

Assuming that you work on master and push to origin,

	cg-log -r master..origin

or

	cg-diff -r master..origin

respectively.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
		-- Samuel Beckett

Re: qiuestion about Git and Cogito

[Petr Baudis]

On Thu, Mar 22, 2007 at 02:57:25PM CET, Francois Lang wrote:
> Interesting...for me, when I do what you suggested, i.e.,
> 
> cg-log -r master..origin
> 
> it does not tell me what has been locally committed but not yet pushed.
> 
> To get that behavior, I need to do
> 
> cg-log -r origin..master.
> 
> Does that make sense to you, or am I confused? I do work on master and 
> push to origin.

Oh, of course - I got it swapped in my head. :-)

It isn't the most intuitive syntax, admittedly, but I couldn't think of
anything better. The way to think about it is "show me the commits
that appeared between origin and master", where

	a - b - c - d - e
	 origin ^
	         master ^

thus it will show the locally committed but not yet pushed d and e. This
maps nicely to the range syntax if you think about it, but it isn't
terribly intuitive. :-(

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
		-- Samuel Beckett