{"id":63438,"date":"2022-04-06T09:00:53","date_gmt":"2022-04-06T09:00:53","guid":{"rendered":"https:\/\/www.cryptocabaret.com\/?p=63438"},"modified":"2022-04-06T09:00:53","modified_gmt":"2022-04-06T09:00:53","slug":"10-git-tips-we-cant-live-without","status":"publish","type":"post","link":"https:\/\/www.cryptocabaret.com\/?p=63438","title":{"rendered":"10 Git tips we can’t live without"},"content":{"rendered":"

10 Git tips we can’t live without<\/span>
\nAmyJune Hineline<\/a><\/span>
\nWed, 04\/06\/2022 – 03:00<\/span><\/p>\n

\n
Up<\/div>\n
Register<\/a> or Login<\/a> to like.<\/div>\n<\/div>\n
\n

Git tips are a dime a dozen, and it’s a good thing because you can never get enough of them. If you use Git every day, then every tip, trick, and shortcut you can find is potentially time and effort saved. I asked Opensource.com community members for their favorite Git hacks. Here they are!<\/p>\n<\/p>\n

\n
More on Git<\/div>\n
\n
What is Git?<\/a><\/div>\n
Git cheat sheet<\/a><\/div>\n
Markdown cheat sheet<\/a><\/div>\n
New Git articles<\/a><\/div>\n<\/p><\/div>\n<\/p><\/div>\n

add<\/h2>\n

The git add --patch<\/code> (-p<\/code> for short) command kicks off an interactive review of chunks of changes that you can add, split into smaller chunks, or ignore (among other things). That way, you can be sure to limit your changes to a specific commit.<\/p>\n

\u2014Kevin Thull<\/a><\/p>\n

I use git add -p<\/code> to review changes a hunk at a time before they’re committed. It lets you check whether you forgot to remove some sketchy ideas, stray comments, or other things you shouldn’t commit.<\/p>\n

\u2014Ryan Price<\/a><\/p>\n

amend<\/h2>\n

The Git option --amend<\/code> is a helpful alternative to creating several commits and then squashing them into one commit through an interactive rebase. I like that you can continually amend your first commit to add additional changes as necessary.<\/p>\n

\u2014Ashley Hardin<\/a><\/p>\n

bisect<\/h2>\n

I know I screwed something up, but I have no idea when. That’s what git-bisect<\/code> is for.<\/p>\n

In a previous life, I was a backend developer of Drupal and WordPress at an agency outside of Chicago. I had multiple customer sites I was working on at any one time, bouncing back and forth between them like a pinball. Every now and then, someone would find an undocumented feature in my code and, with fuzzy memory because of all the different client sites, git-bisect<\/code> would come in handy with helping me find the culprit.<\/p>\n

\u2014Eric Michalsen<\/a><\/p>\n

blame<\/h2>\n

Contrary to the name of the git blame<\/code> command, I don’t use it to blame others. It’s great when you’re taking over repositories that you didn’t initialize. You can see when certain changes were completed and hopefully the commit messages behind them too. It’s a wonderful troubleshooting tool.<\/p>\n

\u2014Miriam Goldman<\/a><\/p>\n

checkout<\/h2>\n

I use git checkout -<\/code> to change to the previous branch. It’s handy for switching from a feature branch back to the main development branch and back again.<\/p>\n

\u2014Kevin Thull<\/a><\/p>\n

diff<\/h2>\n

I like the git diff --staged<\/code> command to review all of the staged changes before committing.<\/p>\n

\u2014Kevin Thull<\/a><\/p>\n

status<\/h2>\n

I seem to touch many files when I work, and git status<\/code> is a lifesaver. Understanding the state of the working directory and staging area with git status<\/code> has helped me learn those core concepts in Git and make sure all my work is committed!<\/p>\n

\u2014Ravi Lachhman<\/a>, Field CTO at Shipa<\/p>\n

squash (rebase -i)<\/h2>\n

I like to use this command<\/a> to squash several commits into one. Start by using git rebase -i HEAD~#<\/code> where #<\/code> is the number of commits to squash. Change pick<\/code> to squash<\/code> on each commit that should become part of the one above<\/em> it. Then edit your commit messages as you see fit. It keeps the commit history very tidy.<\/p>\n

\u2014Ryan Marks<\/a><\/p>\n

update-index<\/h2>\n

Use this with caution!<\/p>\n

\n$ <\/span>git update-index<\/span> --assume-unchanged<\/span> path\/<\/span>to\/<\/span>file<\/span><\/code><\/span><\/pre>\n
It’s handy for marking a file unchanged that has local changes or just one of those pesky files that continually swears it’s been changed even though you’ve done absolutely nothing to it.<\/p>\n
worktree<\/h2>\n
One of my favorites is the git-worktree<\/code> feature, which manages simultaneous checkouts<\/a> of different branches in a repo without making a wholesale copy of the files.<\/p>\n
Here’s an example:<\/p>\n
\n$ <\/span>git<\/span> worktree add ..\/<\/span>feature-branch feature-branch<\/code><\/span><\/pre>\n
Wrap up<\/h2>\n
Now it’s time to suggest your own favorite tips. What Git commands save you time, or prevent mistakes? What tips do you pass on to new Git users at your workplace? Let us know as we celebrate 17 years of Git goodness this week!<\/p>\n<\/div>\n
\n
Opensource.com community members share their favorite Git tips for saving time or preventing mistakes.<\/p>\n<\/div>\n
\n
\n
  \"Working<\/div>\n
Image by: <\/span><\/p>\n
Opensource.com<\/p>\n<\/div>\n<\/article>\n<\/div>\n
\n
Git<\/a><\/div>\n
Opensource.com community<\/a><\/div>\n<\/p><\/div>\n
What to read next<\/div>\n
\n
What Git aliases are in your .bashrc?<\/a><\/div>\n
A practical guide to using the git stash command<\/a><\/div>\n<\/p><\/div>\n

\n        \"Creative<\/a>This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License.<\/div>\n
\n
\n
Register<\/a> or Login<\/a> to post a comment.<\/div>\n<\/p><\/div>\n<\/section>\n
Powered by WPeMatico<\/a><\/small><\/p>\n","protected":false},"excerpt":{"rendered":"
10 Git tips we can’t live without AmyJune Hineline Wed, 04\/06\/2022 – 03:00 Up Register or Login to like. Git tips are a dime a dozen, and it’s a good thing because you can never get enough of them. If you use Git every day, then every tip, trick, and shortcut you can find is […]<\/p>\n","protected":false},"author":1,"featured_media":63439,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[307],"tags":[],"class_list":["post-63438","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-open-source"],"_links":{"self":[{"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/posts\/63438","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=63438"}],"version-history":[{"count":0,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/posts\/63438\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=\/wp\/v2\/media\/63439"}],"wp:attachment":[{"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=63438"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=63438"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.cryptocabaret.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=63438"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}
\u2014KURT W.K.<\/a><\/p>\n
\u2014Kevin Thull<\/a><\/p>\n