Skip to content

Instantly share code, notes, and snippets.

@Shinrai
Shinrai / reset-hotfix-branch-after-pull-squash.md
Last active April 29, 2019 23:00
Reset Hotfix Branch After Pull Squash

Make sure to close all text editors or any programs accessing the files in the repo prior to running these commands.

Resetting a hotfix branch

git checkout master
git pull
git branch -f hotfix master
git checkout hotfix
#!/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)"