{"id":9221,"date":"2024-06-18T13:23:28","date_gmt":"2024-06-18T17:23:28","guid":{"rendered":"https:\/\/blogs.swarthmore.edu\/its\/?p=9221"},"modified":"2024-07-18T16:51:37","modified_gmt":"2024-07-18T20:51:37","slug":"%f0%9f%94%93-unlocking-the-power-of-git-tips-and-tricks","status":"publish","type":"post","link":"https:\/\/blogs.swarthmore.edu\/its\/2024\/06\/18\/%f0%9f%94%93-unlocking-the-power-of-git-tips-and-tricks\/","title":{"rendered":"Unlocking the Power of Git: Tips and Tricks"},"content":{"rendered":"\n

Git is an indispensable tool in the modern developer’s toolkit. Its powerful version control system and ability to make code more collaborative have made it an industry standard, yet, how much do you really know about git?<\/p>\n\n\n\n

Here are some of the more interesting git commands that I’ve accumulated over the years. (Last updated on 6\/18\/2024)<\/p>\n\n\n\n

Undoing Changes<\/h3>\n

Undo the last commit and keep the changes<\/h4>\n
git reset --soft HEAD~1\n<\/code><\/pre>\n
Undo the last commit and discard the changes<\/h4>\n
git reset --hard HEAD~1\n<\/code><\/pre>\n
Checkouts<\/h3>\n
Checkout a certain commit (without detaching HEAD)<\/h4>\n
git checkout -b <tmp-branch> <commit-hash>\n<\/code><\/pre>\n
Checkout a specific file form a repo<\/h4>\n
git checkout <commit-hash> -- <file-path>\n<\/code><\/pre>\n
Commits<\/h3>\n
Amend the last commit message<\/h4>\n
git commit --amend\n<\/code><\/pre>\n
Branches<\/h3>\n
Delete a local branch<\/h4>\n
git branch -d <branch-name>\n<\/code><\/pre>\n
Delete a remote branch<\/h4>\n
git branch <remote-name> -d <branch-name>\n<\/code><\/pre>\n
Logs<\/h3>\n
Show the the commmit log<\/h4>\n
git log\n<\/code><\/pre>\n
Show the commit log in a pretty graph<\/h4>\n
git log --graph --online --all\n<\/code><\/pre>\n
Stashes<\/h3>\n
Stash your changes<\/h4>\n
git stash\n<\/code><\/pre>\n
Apply your stashed changes<\/h4>\n
git stash apply\n<\/code><\/pre>\n
Submodules<\/h3>\n
Clone a repo with submodules<\/h4>\n
git clone --recurse-submodules <path-to-repo>\n<\/code><\/pre>\n
Add a submodule<\/h4>\n
git submodule add <path-to-submodule-repo>\n<\/code><\/pre>\n
Remove a submodule<\/h4>\n
git rm <path-to-submodule>\n<\/code><\/pre>\n
Bonus: Bisects<\/h3>\n
Using bisect to find bugs<\/h4>\n
# This starts your bisect session\ngit bisect start    \n\n# Mark the current commit as bad\ngit bisect bad      \n\n# Specify the commit where the bug was not present.\ngit bisect good <commit-hash>\n\n# Git will checkout a commit halfway between the 2 specified. It is now up to the user to check that commit.\n\n# IF the commit has the bug, it gets marked as bad\ngit bisect bad\n\n# If the commit DOES NOT have the bug, it gets marked as good\ngit bisect good\n\n# Repeat until the bug is found, then end the session\ngit bisect reset\n<\/code><\/pre>\n<\/div>\n\n\n\n
As a reminder all staff and faculty have access to Swarthmore’s GitHub instance at github.swarthmore.edu<\/a> <\/p>\n","protected":false},"excerpt":{"rendered":"
Git is an indispensable tool in the modern developer’s toolkit. Its powerful version control system and ability to make code more collaborative have made it an industry standard, yet, how much do you really know about git? Here are some … Continue reading Unlocking the Power of Git: Tips and Tricks<\/span><\/a><\/p>\n","protected":false},"author":70,"featured_media":9249,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[2,472],"tags":[90,325,274],"class_list":{"0":"post-9221","1":"post","2":"type-post","3":"status-publish","4":"format-standard","5":"has-post-thumbnail","6":"hentry","7":"category-academic-technology","8":"category-github","9":"tag-featured","10":"tag-git","11":"tag-github","13":"fallback-thumbnail"},"jetpack_featured_media_url":"https:\/\/blogs.swarthmore.edu\/its\/wp-content\/uploads\/2024\/06\/totally-not-ai-generated.png","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/ph2nPL-2oJ","_links":{"self":[{"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/posts\/9221","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/users\/70"}],"replies":[{"embeddable":true,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/comments?post=9221"}],"version-history":[{"count":22,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/posts\/9221\/revisions"}],"predecessor-version":[{"id":9272,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/posts\/9221\/revisions\/9272"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/media\/9249"}],"wp:attachment":[{"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/media?parent=9221"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/categories?post=9221"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blogs.swarthmore.edu\/its\/wp-json\/wp\/v2\/tags?post=9221"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}