[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
git uncleaned history
From: |
Jean-Charles Malahieude |
Subject: |
git uncleaned history |
Date: |
Wed, 03 Sep 2008 21:07:25 +0200 |
User-agent: |
Thunderbird 2.0.0.16 (X11/20080723) |
Hi Reinhold,
Truly sorry to admit I have polluted the history tree again.
Here is my tree
~/GIT/Lily/---------------(branches master and lilypond/translation)
|
---Mentors/---(my clone of the master branch)
|
---Traduc/----(my clone of the lp/translation branch)
Please correct me if I anything is wrong in my procedure:
I do all my "traffic" (translating and building) in Traduc, where I do a
"git pull" quite often as you have noticed. Once I'm ready, I do:
cd ..
git branch (to be sure I'm on the right one)
git checkout lilypond/translation (if necessary)
git pull trans (shorthand for "lilypond/translation")
cd Traduc
git pull
git fsck
git gc (and then if nothing seems wrong)
git-status and commit (within emacs)
git format-patch origin
git push
cd ..
git format-patch trans
git push trans
TIA
Jean-Charles