88
What Git clients do you use?
(feddit.nl)
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Follow the wormhole through a path of communities !webdev@programming.dev
The only thing I'm missing in the CLI is easy picking and choosing which change to include in a commit on a more fine grained basis than files. I sometimes have a changed file and the changes fix different issues and thus should get separate commits but with the CLI I can't easily select the changes to be staged. At least not AFAIK.
Edit: Richards law of posting something wrong to get fast correct answers seems to stay true, even on lemmy. Thanks for teaching me something today <3
Uhhh,
git add -p
?the best git command
Hard agree haha, use this one constantly.
You can via git add -i foo.bar
I believe the only issue with that is that it can only go by hunks. If your changes are sufficiently far away, you can select them separately. But if you change one function that should be in patch a, and another function 5 lines down that should be in patch b, I think you're screwed
That being said, this is all from memory, so don't quote me on it
In interactive add mode you can use
s
to split a hunk, ande
to edit it. That's usually enough for me to split things up.I usually use
git add -p
to selectively stage hunks. But ingit add -i
I think running thepatch
command does the same thing to get into patch mode.If patch mode shows you a hunk, and you only want some of the lines you can press
s
to split into smaller hunks. Then you'll be prompted whether to add each smaller hunk separately.If you want to stage a change that is on the same line as a change you don't want to stage, or on an adjacent line, then you need to use
e
to edit the hunk. Git stages whatever changes are left when you're done editing. The file in the working tree on disk is unchanged.git gui is nice for this.
(or jj split).