DEV Community

loading...
Cover image for Undo your last git mistake with ugit

Undo your last git mistake with ugit

Bhupesh Varshney 👾
👨🏾‍💻 Developer | FOSS Creator | Tech Writer | Probably working on something from scratch
Originally published at bhupesh-v.github.io on ・2 min read

So I have been working on this little tool called ugit (and was finally able to release a stable version), the goal is to make it easier for beginner to intermediate git users to undo their last (accidental) git command. Because we are not perfect and commit mistakes.

“Oh wait I deleted the auth-jwt branch without merging!! fuck”

Opens browser

“How to restore deleted branch”

Wastes 5 minutes reading the thread,

Brain context switch, losses focus

“Aarrgh, Git sucks”

Failure is a good way to learn something new but how many times are you going to mess up with git, if your ultimate goal is to deliver the new feature in your startup as fast as possible, huh? Git is great but it’s not really good with developer experience (DX).

Yo bhupesh, I can just you know alias this command. Oh cool, good luck remembering that alias after 1 month when you fuck-up again.

If you are in the gang of getting things done, adding ugit might be a good choice for you.

GitHub logo Bhupesh-V / ugit

🚨️ ugit helps you undo your last (most recent) git command. Your damage control git buddy. Powered by FZF

ugit

ugit logo

Undo your last oopsie 🙈️ in git

build ugit DeepSource License: MIT platform support linux and macos Twitter: bhupeshimself ugit demo: restore file gif

More Video Demos ✨️

Undo git add

undo-git-add.mp4

Undo git branch -D

undo-git-branch-delete.mp4

Undo git merge

undo-git-merge.mp4

Why ugit

  • You did an accidental git command you didn't want to.
  • You don't want to waste your time searching on how to undo ...
  • Because ugit is cool

Motivations behind writing ugit 🙇‍♂️️

What's in the box

ugit/git-undo supports undoing following operations, some are a WIP. If you know of any other operations that can be undone and is not in the list, make sure to send a quick PR 💛️

  • Undo git commit
  • Undo git add
  • Undo git push
  • Undo git branch -D (branch delete)
  • Undo git pull
  • Undo git reset
  • Undo git tag -d (tag delete)
  • Undo git stash apply
  • Undo git stash pop/drop/clear
  • Undo accidental file delete (Restore a deleted file after a commit)
  • Undo (Restore) a file…

Ok enough talking.

What is ugit?

It’s just a simple shell script with guided programmatic steps to undo your last git command, powered by FZF built for people who live and work with terminals every day.

Guided Tutorials

Below are some GIF demos of undoing some git operations, the list is long (around 17 scenarios) but I am only demonstrating some common ones.

Undoing git add

Undoing git branch -D (Restore deleted branch)

Undoing/Restoring file to previous version

Undoing git merge

I don’t like your stupid script

sad dogo crying

Cool, I mean we are still friends right?? Friends help friends avoid git mistakes, that’s why I wrote an accompanying text guide on How to undo anything in Git.

Share it with your friends, co-workers. No hard feelings

Peace ✌️

Discussion (4)

Collapse
moopet profile image
Ben Sinclair • Edited

Yo bhupesh, I can just you know alias this command.

That was literally gong through my head for the first half of this post.

Now, I actually want to install this. It's a really smart idea.

Collapse
bhupesh profile image
Bhupesh Varshney 👾 Author

I like aliasing commands too
Sometimes commands become complex, half of the time I don't have good enough 3-4 letters aliases (since they are all booked)

I hope ugit helps, contributions/feedback are always welcomed <3

Collapse
deven96 profile image
Diretnan Domnan

Really like this

Collapse
bhupesh profile image
Bhupesh Varshney 👾 Author

Thanks :)
Do provide some feedback though, when you try it
Hop into github.com/Bhupesh-V/ugit/discussi...

Forem Open with the Forem app