gitfu

Reset all files that conflict but keep the non-conflicted ones:

for i in $(git status | grep "both modified" | awk '{print $3}'); do git reset HEAD $i && git checkout -- $i; done



Delete all branches but one

for i in $(git ls-remote -q | grep "refs/head" | cut -d '/' -f 3 | awk '!(/^<BRANCH_NAME_TO_KEEP>$/)'); do git push origin :$i; done

Example:
for i in $(git ls-remote -q | grep "refs/head" | cut -d '/' -f 3 | awk '!(/^7.1.2-flash$/)'); do git push origin :$i; done



Add a git log for merge commits:

git merge --log=$(git rev-list --count <CURRENT_BRANCH>..<BRANCH_TO_MERGE>) <BRANCH_TO_MERGE>