Reordering diff lines

[matiasmorant]

Let's say I have this diff:

- a
- b
- c
+ A
+ B
+ C

I only like the change in B, so I only stage changes on B/b, however, that gives:

a
- b
c
+ B

resulting in

a
c
B

not the desired

a
B
c

You could use the patch edit feature, but that is very cumbersome for this common case of just wanting to reorder diff lines.

I'd like to have this diff instead:

-a
+A
-b
+B
-c
+C

A feature to reorder diff line positions would be great.
This seems to be a common problem, is there a simple way of solving it? Couldn't find any

[stefanhaller]

I don't agree that this is a common problem.

We recently solved this (#5396) for the case that you are staging only a (or a and b), or only c (or b and c), in other words only the first or second half of a block of changes. This didn't work before 0.61, and now it does. #5396 does mention the case you describe here, which is to stage changes from the middle of the block, and why it wasn't fixed as well (it's hard).

The "Edit Hunk" feature exists and can probably be used to solve this if you know how to use it (I don't, which I admit quite frankly).

The obvious workaround is to manually revert the change to either a or c in your editor, then stage b, then undo the revert. This is straightforward enough that I don't think we need to add another feature to lazygit to make this easier.