Programming

22057 readers

153 users here now

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 programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 2 years ago

MODERATORS

snowe@programming.dev

Ategon@programming.dev

MaungaHikoi@lemmy.nz

UlrikHD@programming.dev

What Git clients do you use? (self.programming)

submitted 2 days ago by Faalangst_26 to c/programming@programming.dev

88 comments fedilink hide all child comments

I'm wondering if you use any (graphical) clients to manage your Git, and if so, what client you use.

I myself have to use git professionally across all 3 major OS-es, and I currently use Sourcetree on Windows and macOS, and the Git tools built-in into IntelliJ on Linux.

Have given MaGit a try, but just couldn't get all the shortcuts to stick in my mind.

Interested to hear your experiences!

you are viewing a single comment's thread
view the rest of the comments

[–] The2b@lemmy.vg 6 points 2 days ago* (last edited 2 days ago) (2 children)

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

[–] Corngood@lemmy.ml 8 points 2 days ago

In interactive add mode you can use s to split a hunk, and e to edit it. That's usually enough for me to split things up.

[–] hallettj@leminal.space 6 points 2 days ago

I usually use git add -p to selectively stage hunks. But in git add -i I think running the patch 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.