From: Linus Torvalds Date: Sat, 21 May 2005 23:41:24 GMT Subject: Re: cogito - how do I ??? Message-ID: In-Reply-To: <2765.10.10.10.24.1116713164.squirrel@linux1> On Sat, 21 May 2005, 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 In the raw git interfaces, you'd basically have to do the same thing that "git-pull-script" does, except that _instead_ of calling the git-resolve-script thing, you'd do git-rev-tree MERGE_HEAD ^HEAD | git-diff-tree -v -m -s --stdin to show what is in the downloaded MERGE_HEAD but not in HEAD. > > 2) Export of individual patches. "bk export -tpatch -r1.2345" > > I have nu public git repository yet so I have to feed changes as > > plain patches. Browsing cg-* I did not find the command to do this. > > cg-diff -p -r SHA1 And again, without the porcelain this is: git-diff-tree -v -p (Basically, you can do _anything_ with "git-diff-tree". For example, you want "cg log"? Do git-rev-list HEAD | git-diff-tree --stdin -v -m -s which is basically what "git-whatchanged" does). Linus