Justin schrieb: > Alexey Shvetsov schrieb: >> On Понедельник 23 февраля 2009 10:08:55 Flammie Pirinen wrote: >>> 2009-02-22, My Th sanoi: >>>> There is my work flow with git on Science overlay. >>>> >>>>> $ git clone git+ssh://[email protected]/proj/sci.git >>>>> $ git branch $NAME >>>>> $ git checkout $NAME >>>> ... edit ... >>>> >>>>> $ git add $FILES >>>>> $ export ECHANGELOG_USER="Your Name <[email protected]>" >>>>> $ echangelog >>>>> $ ebuild *.ebuild digest >>>>> $ repoman -p full >>>>> $ git add $FILES >>>>> $ git status >>>>> $ git commit >>>>> $ git push --dry-run -v origin HEAD:master >>>>> $ git checkout master >>>>> $ git pull origin >>>>> $ git checkout $NAME >>>>> $ git rebase master >>>>> $ git push --dry-run -v origin HEAD:master >>>>> $ git push -v origin HEAD:master >>>>> $ git checkout master >>>>> $ git pull origin >>>>> $ git branch -d $NAME >>> I wonder if this short and simple work flow is really all necessary. I >>> have to admit I have no prior experience with DVCS’s and in last thread >>> when I asked advice no one replied, so I just did something along the >>> lines of: >>> >>> $ git pull >>> $ vim >>> $ git commit >>> $ git push >>> >>> During my last update. It seemed like it worked though? Will something >>> break soon if I continue to use this set of commands? What is the work >>> flow for trivial version bump, if so? I would hope that I do not have >>> to execute some 22 commands every time I bump my packages from now on. >> Better >> $ git pull >> $ vim >> $ echangelog >> $ repoman commit >> $ git push >> > > But whats important from alexxy's solution is, that if you cannot push, > because your HEAD is not up2date than do > > git pull --rebase > > and not only > > git pull >
Sorry wasn't alexxys solution, it was from rei4dan. But I hit some bad thing, I am working alot with branches and noted that the .git dir growths and growths, although I removed the branches. Can I clean this up?
signature.asc
Description: OpenPGP digital signature
