start new:
tmux
start new with session name:
tmux new -s myname
jbgo
/ git-recover-branch.md
Last active
May 23, 2024 12:29
How to recover a git branch you accidentally deleted
As pointed out by @johntyree in the comments, using git reflog is easier and more reliable. Thanks for the suggestion!
$ git reflog
1ed7510 HEAD@{1}: checkout: moving from develop to 1ed7510
3970d09 HEAD@{2}: checkout: moving from b-fix-build to develop
1ed7510 HEAD@{3}: commit: got everything working the way I want
70b3696 HEAD@{4}: commit: upgrade rails, do some refactoring
MarkusObrist
/ git-mergetool-winmerge-setup.sh
Created
June 6, 2011 13:28
— forked from adilsoncarvalho/git-mergetool-winmerge-setup.sh
shell script that configures git to use WinMerge as the default tool to handle conflicts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| # | |
| # This script will make WinMerge your default tool for diff and merge. | |
| # It must run inside git bash (on Windows) | |
| # | |
| # If your WinMerge is in other place then this one, please edit | |
| WINMERGE_SCRIPT="winmerge-merge.sh" |
NewerOlder