From 2a483b9e2523129779862a0fd086a279d844139c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 26 Sep 2015 20:41:26 -0700 Subject: [PATCH] master and force-master git aliases --- dotfiles/gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index d587f401..479f3b42 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -21,11 +21,13 @@ ffo = !git ffr origin ffr = "!ffr() { git fetch $1 && git ff $1/$(git which-branch) && git suir; }; ffr" file-exists = "!f() { git ls-files $1 --error-unmatch > /dev/null 2> /dev/null; }; f" + force-master = "!f() { git fetch origin && git rh && git master; }; f" icd = "!d() { git difftool --no-prompt --extcmd 'icdiff --cols=200' $@ | $(git config --get core.pager); }; d" icdl = "!d() { git difftool --no-prompt --extcmd 'icdiff --line-numbers --cols=200' $@ | $(git config --get core.pager); }; d" ignore = "!i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i" ignore-untracked="!git untracked | xargs -n1 git ignore" l = log --pretty=oneline --graph + master = checkout origin/master -B master modified = diff HEAD --name-only poh = push origin HEAD pohm = push origin HEAD:master