Posts tagged git

Every time I get the message "To prevent you from losing history, non-fast-forward updates were rejected" I have forgetten how to fix it (in the normal case). Yet another guide to simple rebasing in git. This shit is way too complicated.

I've been meaning to link to this for a while: Deploying at GitHub explains the develop/stage/deploy cycle at github, which can rougly be described as "Like Flickr, but with personal dev environments and using Git". It's light on technical details, but says a lot of the right things.

git-up seems to be the Git tool I had been missing - fetch, stash, rebase, unstash for all branches.

26th November, 6:41 pm

there are plenty of tips for removing files from a git repo history, but this method of just replacing the string is waaay better

23rd November, 1:51 pm

a simple guide to undoing operations in git

22nd March, 11:43 pm

best pull request evar. oh yes

27th August, 11:18 am

git submodules are like svn externals, but with the added benefit of being almost impossible to remove