Skip to contentSkip to conversation

qiuestion about Git and Cogito

DISCUSSION Francois Lang 2 participants 3 messages Jun 15, 2016 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

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

#1 lore raw
Quoted 9 lines · 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.

Assuming that you work on master and push to origin,

cg-log -r master..origin

or

cg-diff -r master..origin

respectively.

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 4 lines · Francois Lang

Interesting...for me, when I do what you suggested, i.e.,

cg-log -r master..origin

Quoted 8 lines

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. :-(

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