|
Home > Archive > Debian Developers > August 2005 > Re: arch, svn, cvs
You are viewing an archived Text-only version of the thread.
To view this thread in it's original format and/or if you want to reply to
this thread please [click here]
| Author |
Re: arch, svn, cvs
|
|
| Martin Langhoff 2005-08-30, 6:01 pm |
| On 8/31/05, George Danchev <danchev@spnet.net> wrote:[vbcol=seagreen]
George's got it right. In practice, I normally use gitk --all, or use
cogito thus:
cg-log -r onebranch:otherbranch=20
cg-diff -r onebranch:otherbranch
Another interesting trick is that you can use git-format-script
onebranch otherbranch and it'll export each patch as an email
(separate files or mbox file) with commit msg and diff. Nothing
earth-shattering, but quite useful.
When you send these, and they get applied, git internals recognize it.
If it was changed when it was being applied, it'll conflict as you'd
expect.
cheers,
martin
|
|
|
|
|