From: Sam Ravnborg <sam@ravnborg.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Sean <seanlkml@sympatico.ca>, git@vger.kernel.org
Subject: Re: cogito - how do I ???
Date: Sun, 22 May 2005 09:14:35 +0200 [thread overview]
Message-ID: <20050522071435.GA10681@mars.ravnborg.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0505211635440.2206@ppc970.osdl.org>
> > > 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
That looks ... long.
I can teach my fingers to use: cg-log, but the above is just too much
to type/remeber do a daily operation.
In bk the usage pattern was to check what was in mainline _before_
fetching and merging. So it seems that with git/cogoto one
has to fetch the chages, inspect them, and then decide to apply or not.
When the fetches changes stay in MERGE_HEAD I assume my work when
committed will be based on top of HEAD - so I do not have to know
if I have fetched some (unmerged) updates.
> 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 <name>
The key here is the SHA1. I hoped to avoid specifying SHA1's with
cogito, I so often miss one character when doing copy'n'paste.
Thanks all for the replies. Now I feel a bit more confident in this.
Sam
next prev parent reply other threads:[~2005-05-22 7:11 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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050522071435.GA10681@mars.ravnborg.org \
--to=sam@ravnborg.org \
--cc=git@vger.kernel.org \
--cc=seanlkml@sympatico.ca \
--cc=torvalds@osdl.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).