Make sure to close all text editors or any programs accessing the files in the repo prior to running these commands.
git checkout master
git pull
git branch -f hotfix master
git checkout hotfix
Nathaniel H Shinrai
Shinrai
/ reset-hotfix-branch-after-pull-squash.md
Last active
April 29, 2019 23:00
Reset Hotfix Branch After Pull Squash
tazjel
/ gource-multiple-repositories.sh
Created
January 10, 2014 11:24
— forked from alibitek/gource-multiple-repositories.sh
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
| #!/usr/bin/env bash | |
| # Generates gource video (h.264) out of multiple repositories. | |
| # Pass the repositories in command line arguments. | |
| # Example: | |
| # <this.sh> /path/to/repo1 /path/to/repo2 | |
| i=0 | |
| for repo in $*; do | |
| # 1. Generate a Gource custom log files for each repo. This can be facilitated by the --output-custom-log FILE option of Gource as of 0.29: | |
| logfile="$(mktemp /tmp/gource.XXXXXX)" |