Skip to content

Instantly share code, notes, and snippets.

View nickfloyd's full-sized avatar
🎯
Taking on problems one byte at a time

Nick Floyd nickfloyd

🎯
Taking on problems one byte at a time
140 followers · 45 following
View GitHub Profile
@nickfloyd
nickfloyd / recipe: deleting branches
Created December 13, 2010 17:56
To delete local and remote branches
-delete the remote
>> git push [remote] :[branch]
-delete the local
>> git branch -d [branch]
ex.
git push origin :dev1
git branch -d dev1
@nickfloyd
nickfloyd / recipe: explicit push
Created December 13, 2010 17:51
When having a remote the same name as the branch then you have to "fully qualify" the push
>> git push [remote] [fork]:[branch]
ex.
git push dev1 ftdev1:master
@nickfloyd
nickfloyd / recipe: cherry-pick tags
Created December 13, 2010 17:40
To cherry pick from head and commit back into a tag
-from master in working branch
>> git branch [new branch] [tag]
>> git checkout [branch]
-pull commit out and add it to the commit at the top of the tag
>> git cherry-pick [commit] or git cherry-pick [firstcommit]^..[lastcommit] if you have a range
-resolve conflicts
-delete the local tag
>> git git tag -d [tag]
-add a new tag at the head of the old one
>> git tag [tag]
@nickfloyd
nickfloyd / Visual Studio .gitignore
Created August 5, 2010 18:00 — forked from jessedearing/Visual Studio .gitignore
gitIgnore file
#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc