Things I wish everyone knew about Git (Part II)

Post by WorldMaker » Wed, Jul 20, 2022, 6:34 PM UTC

beeforpork wrote: post #83

lelandfe wrote: post #32

> A few things can be lost forever! > The dangerous commands are git-reset and git-checkout Don't forget about `git clean`, which will happily gobble up all your important ignored files (API keys, IDE configurations, etc)

That! Also, 'git reset' is only dangerous in some modes, e.g., --hard. It's a user experience nightmare to have the same command be nice in one case and dangerous in another, depending on an option parameter. It is a very useful command, so it's likely that you accidentally lose your local changes the one day when you're a bit tired, maybe. Also, 'git checkout' is used for many good things like, well, checkout. To ab…

Post by vasergen » Wed, Jul 20, 2022, 8:54 PM UTC

js2 wrote: post #119

mabbo wrote: post #44

I said this in another comment recently about git, but I find it odd that even after a decade of using git as a mandatory part of my professional life, I'm still learning new things. That's maybe not a good sign about the usability of git. That `@{'3 days ago'}` thing? That's incredible. Why didn't I know about that 8 years ago? Why wasn't it obvious, intuitive to me that this was possible? git is brilliant and I lov…

> I said this in another comment recently about git, but I find it odd that even after a decade of using git as a mandatory part of my professional life, I'm still learning new things. If I can humbly offer a suggestion: read the man pages. A man page read once thoroughly is much more useful than the same man page skimmed 1000 times. The syntax in question is in the rev-parse man page (`git help rev-parse`). These ar…

Post by wdkrnls » Thu, Jul 21, 2022, 12:25 AM UTC

formerly_proven wrote: post #24

shikoba wrote: post #21

Earlier quoted context omitted.

You can't recover where your references were but all the objects (anything with a SHA1) are still there.

reflog tells you when you created/changed a label and what ID it had, so you can recover them.

Post by cassianoleal » Thu, Jul 21, 2022, 2:55 AM UTC

greggyb wrote: post #93

cassianoleal wrote: post #80

Earlier quoted context omitted.

What's `git gui`? $ git gui git: 'gui' is not a git command. See 'git --help'. The most similar commands are ci gc grep init lg80 pull push

Your package manager seems not to include it. `git gui` is available in the standard Windows installer for git. The package on Ubuntu 20.04 seems to not include the gui. As noted on git website, there are two GUIs that are in-tree -- native components of the project. https://git-scm.com/downloads/guis

Post by chrismorgan » Thu, Jul 21, 2022, 4:46 AM UTC

bityard wrote: post #109

chrismorgan wrote: post #81

Earlier quoted context omitted.

> Look at the comments telling you which files have been changed. And you can make this even better by adding the diff that’s being committed with verbose mode (see `git commit --help`), so that you can scroll down and easily see exactly what’s going into the commit: git commit --verbose You can make it permanent so: git config --global commit.verbose 1 I also recommend setting commit.cleanup = scissors as a related…

Thanks for this tip. One of the things I always did in larger commits was compose the commit message in a separate text editor while reviewing the diff in my terminal. This puts the diff right where I can see it, although time will tell if I enjoy scrolling up and down to switch between reading the diff and editing the commit message.