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
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
- You accidentally ran a
git
command you wish to 'undo'. - You want to save time by not searching for how to undo ...
- Your focus is on the problems at hand and not on Git (avoid context switching)
ugit
/git-undo
supports undoing the following operations, some are a WIP. If you know of any other operations that can be undone and are not in the list, make sure to raise an issue or make 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 to a previous version
- Undo
git merge
- Undo
git cherry-pick
- Undo
git tag
- Undo
git rebase
- Undo
git worktree remove
(recover deleted work-tree)
Contribute to the project by helping me with the above-mentioned tasks.
If you have any other ideas/suggestions, do send them across. Hop in to ugit discussions 💬️
When | What |
---|---|
29 Oct, 2022 | ugit crossed 1k stars |
02 June, 2022 | console.dev featured ugit |
18 May, 2022 | I gave a talk about the git tooling ecosystem & git undo in Undo git, say whaat! - GitHub India Constellation, May 2022 |
12 May, 2021 | The guide was tweeted by GitHub (I was logging my research process there while building ugit) |
30 April, 2021 | Featured on Changelog News |
- Alexander Alemayhu made a YouTube tutorial on Undoing Your Last Git Commit with Ugit
docker pull bhupeshimself/ugit
docker run --rm -it -v $(pwd):/app bhupeshimself/ugit
ugit dependencies:
- Bash >=
4.x.x
- Git >=
2.23.0
- fzf >=
0.21.0
- Installation guide - GNU utils like
awk
,grep
,tput
etc
sh -c "$(curl -fsSL https://raw.githubusercontent.com/Bhupesh-V/ugit/master/install)"
Arch Linux users can install ugit via AUR.
brew install ugit
To use ugit on Windows you need to install:
-
Git Bash
Git bash comes with git (if you have installed it on your machine then no need). To install git (preferably with scoop):scoop install git
-
FZF
scoop install fzf
Alternatively, with Chocolatey:
choco install fzf
-
To use bash in terminal change your directory to
**git\2.35.3.windows.1\bin\bash**
accordingly. -
Then either clone the repo,
git clone https://github.com/Bhupesh-V/ugit.git
or get it using curl:
sh -c "$(curl -fsSL https://raw.githubusercontent.com/Bhupesh-V/ugit/master/install)"
Fig adds apps, shortcuts, and autocomplete to your existing terminal.
Install ugit
in just one click.
If you're using Zgenom:
- Add
zgenom load Bhupesh-V/ugit
to your.zshrc
along with your otherzgenom load
commands. zgenom reset && zgenom save
If you're using Antigen:
- Add
antigen bundle Bhupesh-V/ugit
to your.zshrc
where you've listed your other plugins. - Close and reopen your Terminal/iTerm window to refresh context and use the plugin. Alternatively, you can run
antigen bundle Bhupesh-V/ugit
in a running shell to haveantigen
load the new plugin.
If you're using oh-my-zsh:
-
Clone the repository into a new
ugit
directory in oh-my-zsh's plugin folder:git clone https://github.com/Bhupesh-V/ugit.git $ZSH_CUSTOM/plugins/ugit
-
Edit your
~/.zshrc
and addugit
– same as clone directory – to the list of plugins to enable:plugins=( ... ugit )
-
Then, restart your terminal application to refresh context and use the plugin. Alternatively, you can source your current shell configuration:
source ~/.zshrc
Git comes with a garbage collector (in case you didn't know) therefore undoing some commands will become impossible if the entries are deleted from the reflog. One way to prevent this is to increase default time limits before the reflog entries expire.
Add these configurations in your global .gitconfig
file:
[gc]
# default 90 days
reflogExpire = 200
Used to set how long records in a branch reflog should be preserved.
[gc]
# default 30 days
reflogExpireUnreachable = 90
Used to set how long inaccessible reflog records should be preserved.
You can read my in-process guide on How to undo anything in Git
To all the SO threads that I will probably never visit again ;)
Support me by giving a ⭐️ if this project helped you! or just
Copyright © 2021 Bhupesh Varshney.
This project is MIT licensed.
Please read the CONTRIBUTING file for the process of submitting pull requests to us.
Thanks goes to these wonderful people (emoji key):
This project follows the all-contributors specification. Contributions of any kind welcome!