Commit partial changes

[Fomys]

Hi!

I just tested the git integration, very impressive! I really like it.

Is there a way to commit only partial changes, like I can with jetbrains? For example, If I have this diff:

@@ -2148,7 +2156,8 @@ static void usage(char *name)
        fprintf(stderr, "\t-r\tset the preferred mode for all connectors\n");
        fprintf(stderr, "\t-w <obj_id>:<prop_name>:<value>\tset property, see 'property'\n");
        fprintf(stderr, "\t-a \tuse atomic API\n");
-       fprintf(stderr, "\t-F pattern1,pattern2\tspecify fill patterns\n");
+       fprintf(stderr, "\t-F pattern1,pattern2\tspecify fill patterns (plain, smpte, tiles, gradient)\n");
+       fprintf(stderr, "\t-V <RRGGBB hex value>\tspecify RGB hex color for plain pattern\n");
        fprintf(stderr, "\t-o <desired file path> \t Dump writeback output buffer to file\n");

        fprintf(stderr, "\n Generic options:\n\n");

I want to commit only the part:

-       fprintf(stderr, "\t-F pattern1,pattern2\tspecify fill patterns\n");
+       fprintf(stderr, "\t-F pattern1,pattern2\tspecify fill patterns (plain, smpte, tiles, gradient)\n");

And keep the

+       fprintf(stderr, "\t-V <RRGGBB hex value>\tspecify RGB hex color for plain pattern\n");

for another commit.

Thanks!

[trevorstarick]

I occasionally use GitHub Desktop when I need to do those "more complicated" commits, and the way it's handled there is like this:

The first "checked column" is a quick toggle for that entire diff section. After that, each row can then toggled to include/remove that lines changes.

[trevorstarick]

additionally, right clicking a change gives you the option to discard it entirely:

[cole-miller]

We do have the "discard" feature at hunk granularity (git: restore, or "Restore" in the floating hunk controls).

[ksweetie]

In VS Code, I'll usually highlight the lines I want to stage, and either right click -> Stage Selected Ranges, or just use the hotkey. Having a checkbox for each line seems convenient when using the mouse. Being able to stage partial hunks with vim and never leaving the keyboard is nice as well.

[cole-miller]

Currently we don't have support for splitting diff hunks like this, or line-by-line staging. Probably the quickest way to achieve your goal with the existing feature set is to delete/cut the RRGGBB line, save, stage the hunk that's left, put the deleted line back, then commit.