[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: my git stupidity
From: |
Bruno Haible |
Subject: |
Re: my git stupidity |
Date: |
Thu, 13 Mar 2008 03:55:16 +0100 |
User-agent: |
KMail/1.5.4 |
Karl Berry wrote:
> I think I inadvertently messed up the git commit again (committed before
> pulling on trunk). I don't remember the terminology, sorry.
To avoid these "merge commits" in public repositories, with the git commands I
use, it is sufficient to get alarmed when the commit message editor pops up
and proposes you a message like
Merge branch 'master' of ssh://address@hidden/srv/git/gnulib
*Then* I would run "git rebase master" or "git rebase origin/master" (sorry
I don't remember which one).
But maybe you use different git commands; then maybe BenoƮt can help you?
Bruno