gitx icon indicating copy to clipboard operation
gitx copied to clipboard

add "reset branch to commit" feature

Open simonwagner opened this issue 13 years ago • 7 comments

add a "reset branch to commit" feature, like it exists in GitX (L).

I will try to implement it myself, but as I am currently very busy, I can't promise it.

simonwagner avatar May 22 '12 22:05 simonwagner

It's definitely a feature that I'd like to see added; and have considered it myself.

One thing to look out for, though - is that a reset is potentially destructive; if one or more commits would be left dangling after the operation. I'd definitely like to see a severe "would you like to continue" prompt, at least in that case.

An alternative would be to default to creating a tag for the branch that is being moved at the current location (with an option to un-check it, like the create branch dialog has the option to not check out the new branch); i.e. resetting test branch could create a tag resets/test_branch/[short sha] - which the user could then delete manually once they were sure they didn't want to refer to the old history.

rowanj avatar May 23 '12 01:05 rowanj

When doing that, you'll want to provide user with a choice of reset modes (soft, hard, mixed), together with a compact explanation of what they mean.

I'm strongly against creating tags for this type of use-case scenarios. It shouldn't be hard to figure out if commits will be made unreachable by the reset operation, since the CLI already does that. It should be detected by the interface where user will choose reset mode, and in case commits would be made unreachable, then it'd also offer an option to create a new branch at the old location, or ignore.

RomainMuller avatar Jul 05 '12 09:07 RomainMuller

I think the @laullon fork has a very good implementation of the "Reset to..." feature. It even offers the explanations as @RomainMuller suggests. I've had no problems with it...and it makes that fork my "goto" GitX app.

dvdrtrgn avatar Jan 10 '13 16:01 dvdrtrgn

It would be very useful! This is the main feature I miss from gitk.

ngrilly avatar May 25 '13 20:05 ngrilly

+1

roddi avatar Jul 18 '13 11:07 roddi

+1 I've just come across this fork of gitx and love it. Within one day of use however I was looking for the reset functionality I have come to rely on in gitx (l).

stuintrepica avatar Feb 26 '15 03:02 stuintrepica

+1 this fork is awesome but 'reset here' in popup is really needed.

ghost avatar Dec 20 '16 14:12 ghost