server-1.2-branch accidentally merged with master

Tue Oct 10 01:57:08 PDT 2006

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>

-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer