Log message #579585

# At Username Text
# Mar 9th 2009, 16:15 alkemann my problem with the tmp folder is that i have a "clear cache" button baked in admin view. it deletes the folder and rebuilds the folders.. kinda also takes the .gitignore heh
# Mar 9th 2009, 16:14 AD7six not quite so critical, but still.
# Mar 9th 2009, 16:14 alkemann wouldnt kill anyone to have them logged though
# Mar 9th 2009, 16:14 AD7six jperras: oh cool... I've added some tmp folders that were created by putting logging code in the editor console - and the tmp dir being created from the working dir at the time..
# Mar 9th 2009, 16:13 jperras alkemann: favourite because it solved my problem of having mistakenly committed my tmp folder due to a misconfigured .gitignore
# Mar 9th 2009, 16:13 jperras but awesome when you accidentally commit say a temp file, or core.php, or database.php
# Mar 9th 2009, 16:12 alkemann jperras: why would u need that enough for it to become favorite ? :P
# Mar 9th 2009, 16:12 jperras dangerous because if you have pushed some code remotely, then it'll screw with other peoples repos
# Mar 9th 2009, 16:12 AD7six ACTION heads to google..
# Mar 9th 2009, 16:12 alkemann also temporary branches to work on several minor things paralell is nice
# Mar 9th 2009, 16:12 jperras removes a file completely from your history
# Mar 9th 2009, 16:11 jperras my favourite (but quite dangerous) command is "git-filter-branch --tree-filter 'rm -f <filename>' HEAD"
# Mar 9th 2009, 16:11 alkemann it was very useful in debugging a bug that came as a result of refactoring. so easy to compare
# Mar 9th 2009, 16:10 alkemann yes i learned that the other day. LOVE it
# Mar 9th 2009, 16:10 AD7six even though I'm still finding my feet
# Mar 9th 2009, 16:10 AD7six git stash is probably my favorite command atm
# Mar 9th 2009, 16:09 AD7six in (hopefully not much) time, it should all be second nature and easy
# Mar 9th 2009, 16:03 alkemann i know that forks are just imaginary (for git), but they are still adding a complexity level i dont completely grasp yet..
# Mar 9th 2009, 16:00 alkemann so u got a forked version of the 2.0.x.x branch now?
# Mar 9th 2009, 15:54 AD7six alkemann: http://thechaw.com/forks/AD7six/bakery/commits/view/43fdaf34e7f4c6610c470f88c98181561e5a7c0b
# Mar 9th 2009, 15:37 alkemann AD7six: i think u should just delete what u got, do a new git init and add the main repo as origin remote. then git pulling will get both master and 2.0.x.x
# Mar 9th 2009, 15:37 ADmad yeah for me too its just "2.0.x.x"
# Mar 9th 2009, 15:36 AD7six probably a syntax mistake on mypart
# Mar 9th 2009, 15:36 ADmad if origin/2.0.x.x is your working branch shouldnt you just do "git pull" to update ?
# Mar 9th 2009, 15:36 alkemann says only "master" and "2.0.x.x" when i do git branch on my comp
# Mar 9th 2009, 15:35 AD7six don't know/remember.
# Mar 9th 2009, 15:35 alkemann creating*
# Mar 9th 2009, 15:35 alkemann u use the --track option when creting it?
# Mar 9th 2009, 15:35 AD7six warning: refname 'origin/2.0.x.x' is ambiguous.
# Mar 9th 2009, 15:35 AD7six andy@andy-fuji:~/dev/apps/bakery2$ git checkout origin/2.0.x.x
# Mar 9th 2009, 15:35 AD7six but it's the name of my local branch afaik
# Mar 9th 2009, 15:34 alkemann origin meaning remote on thechaw. i think that is correct
# Mar 9th 2009, 15:34 AD7six "origin"/2.0.x.x ?
# Mar 9th 2009, 15:34 AD7six origin/2.0.x.x
# Mar 9th 2009, 15:34 AD7six * master
# Mar 9th 2009, 15:34 AD7six is my local branch misnamed? andy@andy-fuji:~/dev/apps/bakery2$ git branch
# Mar 9th 2009, 15:33 alkemann ok, lets get stuff merged then :)
# Mar 9th 2009, 15:32 alkemann sounds good,. the one in my branch is messy
# Mar 9th 2009, 15:32 ADmad alkemann: there shouldnt be much more than that... as AD7six said he did all the schema changes we discussed on his fork
# Mar 9th 2009, 15:32 AD7six it's more generic and in most respects from my pov simpler
# Mar 9th 2009, 15:31 alkemann but if u got a better schema we can go from, thats great