Last active
October 11, 2025 01:18
-
Star
(864)
You must be signed in to star a gist -
Fork
(487)
You must be signed in to fork a gist
-
-
Save cferdinandi/ef665330286fd5d7127d to your computer and use it in GitHub Desktop.
Revisions
-
Chris Ferdinandi revised this gist
Oct 15, 2014 . 1 changed file with 1 addition and 10 deletions.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -160,13 +160,4 @@ git config --global core.editor "subl -n -w" ### If that's not working sudo rm -rf /usr/local/bin/subl sudo ln -s /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl /usr/local/bin -
Chris Ferdinandi revised this gist
Oct 15, 2014 . 1 changed file with 2 additions and 0 deletions.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -34,6 +34,8 @@ git push origin <branch> # Push branch to remote git branch -d <branchname> # deletes local branch git push origin :<branchname> # deletes remote branch git subtree push --prefix docs origin gh-pages # push docs as subtree to gh-pages ### Clone Directory -
Chris Ferdinandi revised this gist
Oct 14, 2014 . 1 changed file with 1 addition and 0 deletions.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -164,6 +164,7 @@ sudo ln -s /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl /u ## LocalDev cd ~/code/vagrant ./localdev suspend ./localdev resume ./localdev restore -
Chris Ferdinandi revised this gist
Oct 14, 2014 . 1 changed file with 9 additions and 1 deletion.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -158,4 +158,12 @@ git config --global core.editor "subl -n -w" ### If that's not working sudo rm -rf /usr/local/bin/subl sudo ln -s /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl /usr/local/bin ## LocalDev ./localdev suspend ./localdev resume ./localdev restore -
Chris Ferdinandi revised this gist
Oct 10, 2014 . 1 changed file with 6 additions and 1 deletion.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -153,4 +153,9 @@ git diff --stat HEAD ## Sublime as default text editor cd ~ mkdir bin ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" ~/bin/subl git config --global core.editor "subl -n -w" ### If that's not working sudo rm -rf /usr/local/bin/subl sudo ln -s /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl /usr/local/bin -
Chris Ferdinandi revised this gist
Oct 8, 2014 . 1 changed file with 4 additions and 2 deletions.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -150,5 +150,7 @@ git diff --stat HEAD ## Sublime as default text editor cd ~ mkdir bin ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" ~/bin/subl -
Chris Ferdinandi revised this gist
Oct 8, 2014 . 1 changed file with 7 additions and 1 deletion.There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -145,4 +145,10 @@ git diff origin..master # pipes a diff into PAGER git diff origin..master > my.patch # pipes a diff into my.patch # get diffstat of uncommitted work git diff --stat HEAD ## Changing Text Editor Settings Sublime as default text editor sudo ln -s /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl /usr/bin/subl -
Chris Ferdinandi renamed this gist
Aug 19, 2014 . 1 changed file with 0 additions and 0 deletions.There are no files selected for viewing
File renamed without changes. -
Chris Ferdinandi created this gist
Aug 19, 2014 .There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode charactersOriginal file line number Diff line number Diff line change @@ -0,0 +1,148 @@ # Terminal Cheat Sheet pwd # print working directory ls # list files in directory cd # change directory ~ # home directory .. # up one directory - # previous working directory help # get help -h # get help --help # get help man # manual cat # output the contents of a file mkdir # create new directory open # open a file with the associated program, a directory with Finder, or a URL with the default web browser ps # list all running processes kill # terminate existing process rmd # permanently delete file rmdir # remove directory ## Working with Git ### Quick Start git clone <url> # Clone directory git checkout -b <new-branch> # Create new local branch git push -u origin <new-branch> # Sync local branch with remote git checkout <branch> # Checkout branch git push origin <branch> # Push branch to remote git branch -d <branchname> # deletes local branch git push origin :<branchname> # deletes remote branch ### Clone Directory git clone <url> ### Create Project cd project/ git init # initializes the repository git add . # add those 'unknown' files git commit # commit all changes, edit changelog entry git rm --cached <file>... # ridiculously complicated command to undo, in case you forgot .gitignore ### Branching and Merging git branch # show list of all branches (* is active) git checkout -b linux-work # create a new branch named "linux-work" <make changes> git commit -a git checkout master # go back to master branch git merge linux-work # merge changesets from linux-work (Git >= 1.5) git pull . linux-work # merge changesets from linux-work (all Git versions) git branch -m <oldname> <newname> # rename branch git branch -m <newname> # rename current branch ### Delete Project git branch -d <branchname> # deletes local branch git push origin :<branchname> # deletes remote branch git remote prune <branchname> # update local/remote sync ### Merging Upstream git remote -v # Get list of remote branches git remote add upstream <upstream github url> # Add original as upstream git remote -v # Check upstream git fetch upstream # Get original repo git checkout development # Switch to main branch in local fork git merge upstream/development # Merge original with fork git diff --name-only | uniq | xargs subl # Fix conflicts in Sublime Text ### Importing Patches git apply < ../p/foo.patch git commit -a ### Exporting Patches <make changes> git commit -a -m "commit message" git format-patch HEAD^ # creates 0001-commit-message.txt # (HEAD^ means every patch since one revision before the # tip of the branch, also known as HEAD) ### Inspecting Revisions # inspect history visually gitk # this opens a Tk window, and shows you how the revisions are connected # inspect history git log # this pipes a log of the current branch into your PAGER git log -p # ditto, but append a patch after each commit message # inspect a specific commit git show HEAD # show commit info, diffstat and patch # of the tip of the current branch ### Referring to Revisions # by name git log v1.0.0 # show history leading up to tag "v1.0.0" git log master # show history of branch "master" # relative to a name git show master^ # show parent to last revision of master git show master~2 # show grand parent to tip of master git show master~3 # show great grand parent to tip of master (you get the idea) # by output of "git describe" git show v1.4.4-g730996f # you get this string by calling "git describe" # by hash (internally, all objects are identified by a hash) git show f665776185ad074b236c00751d666da7d1977dbe git show f665776 # a unique prefix is sufficient # tag a revision git tag v1.0.0 # make current HEAD known as "v1.0.0" git tag interesting v1.4.4-g730996f # tag a specific revision (not HEAD) ### Comparing Revisions # diff between two branches git diff origin..master # pipes a diff into PAGER git diff origin..master > my.patch # pipes a diff into my.patch # get diffstat of uncommitted work git diff --stat HEAD