Merge branch 'master' of gitlab.com:EuAndreh/dotfiles

3 files changed, 22 insertions, 1 deletions

diff --git a/bash/env.sh b/bash/env.sh
index 008aaf1b..c81cba2e 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -34,7 +34,7 @@ export PATH="$DOTFILES/scripts/:$PATH"
 export PATH="$DOTFILES/encrypted/scripts/:$PATH"
 export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s"
 export INPUTRC=~/.inputrc
-export CACHE_DIR="~/Nextcloud/cache~/Nextclo"
+export CACHE_DIR="~/Nextcloud/cache"
 
 
 
diff --git a/git/mrconfig.ini b/git/mrconfig.ini
index 51a04cd7..7d837258 100644
--- a/git/mrconfig.ini
+++ b/git/mrconfig.ini
diff --git a/scripts/git-blame-someone-else b/scripts/git-blame-someone-else
new file mode 100755
index 00000000..dd718267
--- /dev/null
+++ b/scripts/git-blame-someone-else
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Taken from https://github.com/jayphelps/git-blame-someone-else/
+
+if [ $# -ne 2 ]; then
+  >&2 echo "Usage: $0 <author> <commit>"
+  exit 1
+fi
+
+AUTHOR=$1
+AUTHOR_NAME=$(echo $AUTHOR | perl -wlne '/^(.*?)\s*<.*>$/ and print $1')
+AUTHOR_EMAIL=$(echo $AUTHOR | perl -wlne '/^.*\s*<(.*)>$/ and print $1')
+COMMIT=$(git rev-parse --short $2)
+
+{
+  GIT_SEQUENCE_EDITOR="sed -i -e 's/^pick $COMMIT/edit $COMMIT/'" git rebase -i $COMMIT~1^^
+  GIT_COMMITTER_NAME="$AUTHOR_NAME" GIT_COMMITTER_EMAIL="$AUTHOR_EMAIL" git commit --amend --no-edit --author="$AUTHOR"
+  # git rebase --continue
+} &> /dev/null
+
+echo "$AUTHOR_NAME is now the author of $COMMIT. You're officially an asshole.";