How to add/discard lines and/or hunks to staging area?

[well1791]

Hi everybody!

I'm trying to switch from gitui to gitu, but, I'm kind of stuck when I have to go hunk by hunk and add/discard lines from a hunk (a smaller hunk).

Any ideas how to achieve that?

[wmorin]

Gitu does this from the status screen. What you act on depends on where the cursor is: a file, a hunk, or a single line.

• j/k move between sections, files and hunks. Tab expands a file to show its hunks.
• ctrl+j/ctrl+k (or ctrl+down/ctrl+up) move one diff line at a time inside a hunk. They skip the context lines and stop on the +/- lines.
• s stages, u unstages, K discards whatever is under the cursor.

So for a hunk: put the cursor on the hunk in "Unstaged changes", press s. To take it back, go to it under "Staged changes" and press u.

For a single line: on the hunk, press ctrl+j until the line you want is highlighted, then s (or u in the staged section, K to drop it from the working tree). For several lines, repeat on each one; as far as I can tell from the source, gitu has no range or visual selection yet.

K asks "Really discard? (y or n)" even for single lines, so answer y.

I checked all six cases (stage, unstage and discard, for a hunk and for one line) on v0.43.0 in a scratch repo, verifying each with git diff --cached and git diff. Line staging has been there since 0.9.0, line discard since 0.33.0. If any of these keys don't do anything for you, check gitu --version, since older releases won't have them.

Default keys: https://github.com/altsem/gitu/blob/master/src/default_config.toml

Is the ctrl+j line movement what you were after, or do you need a multi-line range?

[well1791]

Duuuuudee!!! Thaaaannkss a loooot!! It's kind of confusing because I thought "Up line" was the same as "Up" (but never tried). And now everything makes sense, the menu changes based on context!

thanks a lot! 👐