diff --git a/dotfiles/lib/python/git_diff_replacing.py b/dotfiles/lib/python/git_diff_replacing.py index feaf4cdc..700535a9 100755 --- a/dotfiles/lib/python/git_diff_replacing.py +++ b/dotfiles/lib/python/git_diff_replacing.py @@ -15,7 +15,6 @@ class GitDiffReplacer(object): self.replacing_string = replacing_string self.verbose = verbose - @property def modified_files_command(self): return linecmd('git diff {} {} --name-only', self.source_ref, diff --git a/dotfiles/lib/shellrc/functions.sh b/dotfiles/lib/shellrc/functions.sh index 0c2d4b19..74638233 100644 --- a/dotfiles/lib/shellrc/functions.sh +++ b/dotfiles/lib/shellrc/functions.sh @@ -125,3 +125,13 @@ function git_diff_replacing() { test -z $debug || git diff $original_sha $new_sha --name-only | grep -v "$replacing" git diff $original_sha $new_sha --name-only | grep -v "$replacing" | xargs -I filename sh -c "git diff $original_sha:filename $new_sha:"$replace_sha_string } + +function git_reset_author() { + git filter-branch -f --env-filter ' +if test "$GIT_COMMITTER_NAME" = "Ivan Malison" +then + GIT_COMMITTER_EMAIL="IvanMalison@gmail.com" + export GIT_COMMITTER_EMAIL +fi +' -- --all +} diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf index 0cf6b2ee..99e586e9 100644 --- a/dotfiles/tmux.conf +++ b/dotfiles/tmux.conf @@ -1,4 +1,4 @@ -unbind C-o +unbind C-g set -g prefix C-b bind-key C-b send-prefix