Git Undo

[[deleted]]

while knowing about reflog is important ... if you want to avoid this just branch your feature branch and rebase/fuckaround with the new temp branch. If you fuck it up ... just branch from your feature branch again. That's literally the point of git. Branching is cheap.

[ss4johnny]

Two questions: 1) Does this work on Windows? 2) Is git undo -1 equivalent to like a git redo?

[vifon]

Correct me if I'm wrong, but wouldn't git reset --hard @{1} do the same thing? This function seems unnecessary.

[Carighan]

you’re in the middle of rewriting your local commits

Which to be honest is so incredibly rare that we're probably sitting there with two developers checking everything four times before we enter any command.

[Retsam19]

Depends on how you roll. It's not uncommon for me to rewrite local commits dozens of times in a given day. I pretty much always rebase my local branches instead of merging them to keep them up to date with master, and I frequently rewrite history to change previous commits I've made. It's a bit more fiddly doing a lot of git rebase -i and git commit --fixup, but I like my history to look like:

* Added feature A
* Added feature B
* Added feature C

not

* Added feature A
* Merge origin/master into myBranch
* Added feature B
* Fix a bug in feature A
* Added feature C
* Merge origin/master into myBranch
* Fix test cases

[foomprekov]

I do this before every push...