git hilarity (was: Re: server-1.2-branch accidentally merged with master)

[Daniel Stone]

On Tue, Oct 10, 2006 at 10:57:08AM +0200, Michel Dänzer wrote:
> On Tue, 2006-10-10 at 11:50 +0300, Daniel Stone wrote:
> > On Tue, Oct 10, 2006 at 09:15:48AM +0200, Michel Dänzer wrote:
> > >       * Always double-checking with gitk (or at least something like
> > >         git-log) that things look sane before pushing anything.
> > 
> > Yep.  git-log origin..master should generally DTRT, or git diff
> > origin..master | diffstat.
> 
> Right, and correspondingly for other branches. Also beware that
> 
> git-push <remote>
> 
> without further arguments will push all local commits on all branches
> referenced in .git/remotes/<remote>, so it's safer to use
> 
> git-push <remote> <branch>

While we're here, a couple of things I'd like to know:
  * What's the syntax for 'diff remote branch foo to mine'?  I was
    trying to diff origin:input-hotplug to .:input-hotplug the other
    day, and couldn't work out how.  ('gitk' is not the answer I'm
    looking for here.)
  * I thought git push <remote> only pushed branches marked with Push in
    .git/remotes/<remote>, such that Push x:y will push local branch x
    to remote branch y when git push <remote> is invoked.  Is this
    correct?

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20061010/f13b6796/attachment.pgp>