{"id":263,"date":"2017-11-17T17:05:20","date_gmt":"2017-11-17T17:05:20","guid":{"rendered":"http:\/\/blog.electrongoo.com\/?p=263"},"modified":"2017-11-17T17:05:20","modified_gmt":"2017-11-17T17:05:20","slug":"git-cheat-sheet","status":"publish","type":"post","link":"http:\/\/blog.electrongoo.com\/index.php\/git-cheat-sheet\/","title":{"rendered":"Git cheat-sheet"},"content":{"rendered":"

As a recent cross-over user of Subversion to Git, I occasionally need a refresher of some command-line git operations … and I find myself searching the web.\u00a0 So, I created this list in a single, easy to locate post.\u00a0 Here is a list of Git operations I find most useful.\u00a0 Listed in order of a typical workflow.\u00a0 Hence more interesting (and\u00a0more easily\u00a0forgotten) operations are listed at the end.<\/p>\n

\n
Initial setup<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
sudo apt-get install git<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Initial configuration<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git config --global user.name <\/span><\/code>\"Iam me\"<\/span><\/code><\/div>\n
git config --global user.email me<\/span><\/code>@here<\/span><\/code>.com<\/span><\/code><\/div>\n
git config --global core.editor nano<\/span><\/code><\/div>\n
git config --global credential.helper <\/span><\/code>\"cache --timeout=900\"<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Configure ignored files (using .gitignore file)<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
nano .gitignore<\/span><\/code><\/div>\n
*.o<\/span><\/code><\/div>\n
nohup.out<\/span><\/code><\/div>\n
doc\/*.txt<\/span><\/code><\/div>\n
.vscode<\/span><\/code><\/div>\n
.idea<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Help<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git help <command><\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Initialize a repository<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git init<\/span><\/code><\/div>\n
OR<\/span><\/code><\/div>\n
git clone git:<\/span><\/code>\/\/your.git.url.goes.here<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
View status<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git status<\/span><\/code><\/div>\n
git diff<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Add\/commit files<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git add <filename><\/span><\/code><\/div>\n
git commit<\/span><\/code><\/div>\n
OR<\/span><\/code><\/div>\n
git commit -am <\/span><\/code>\"commit message goes here\"<\/span><\/code>\u00a0\u00a0\u00a0\u00a0 (add all tracked files and commit them in a single command)<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Remove files<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git rm <filename<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Move files<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git mv <filename> <newfilename><\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Updating a commit (before push)<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git commit -am <\/span><\/code>'initial commit'<\/span><\/code><\/div>\n
git add <somefile><\/span><\/code><\/div>\n
git commit --amend<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
View commits<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git status<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Reverting a modified file (not yet staged)<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git checkout -- <file<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Reverting a staged file (e.g. via git add)<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git reset HEAD <file<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Reverting a commit<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git revert <commit-id><\/span><\/code><\/div>\n
git push<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Reverting all local changes<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git reset --hard origin\/master<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Create a new branch<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git checkout -b <name_of_your_new_branch><\/span><\/code><\/div>\n
git push origin <name_of_your_new_branch<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Save\/restore work temporarily<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git stash<\/span><\/code><\/div>\n
***change branches or whatever<\/span><\/code><\/div>\n
git stash pop<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Delete a remote branch<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git push origin --delete <branchName><\/span><\/code><\/div>\n
git fetch -p\u00a0\u00a0\u00a0 <\/span><\/code>\"to refresh local repro\"<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Delete a local branch<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git branch -d <branch_name><\/span><\/code><\/div>\n
git fetch -p\u00a0\u00a0\u00a0 #<\/span><\/code>\"to refresh local repro\"<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Tag a commit (for release or tracking)<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git tag -a <tagname> <commitid><\/span><\/code><\/div>\n
git push origin <tagname><\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Checkout at a tag<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git checkout <tagname><\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n
\n
Merge a branch back into master branch<\/b><\/div>\n
\n
\n
\n\n\n\n
\n
\n
git checkout master<\/span><\/code><\/div>\n
git pull<\/span><\/code><\/div>\n
git checkout <branch><\/span><\/code><\/div>\n
git merge master<\/span><\/code><\/div>\n
# <\/span><\/code>if<\/span><\/code> you have conflicts ... edit the conflicts and then run <\/span><\/code>\"git add <files_edited>\"<\/span><\/code> \"git commit\"<\/span><\/code><\/div>\n
git push<\/span><\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"

As a recent cross-over user of Subversion to Git, I occasionally need a refresher of some command-line git operations … and I find myself searching the web.\u00a0 So, I created this list in a single, easy to locate post.\u00a0 Here is a list of Git operations I find most useful.\u00a0 Listed in order of a … Continue reading Git cheat-sheet<\/span> →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[2],"tags":[],"_links":{"self":[{"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/posts\/263"}],"collection":[{"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/comments?post=263"}],"version-history":[{"count":2,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/posts\/263\/revisions"}],"predecessor-version":[{"id":265,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/posts\/263\/revisions\/265"}],"wp:attachment":[{"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/media?parent=263"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/categories?post=263"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.electrongoo.com\/index.php\/wp-json\/wp\/v2\/tags?post=263"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}