summaryrefslogtreecommitdiff
path: root/bashrc
diff options
context:
space:
mode:
authorDan Goodliffe <dan.goodliffe@octal.co.uk>2021-08-27 11:29:56 +0100
committerDan Goodliffe <dan.goodliffe@octal.co.uk>2021-08-27 11:29:56 +0100
commit1b5b1577d8e2af1182404a07f9d1d85ea794e244 (patch)
tree1927d827c493b3a463de53ea42f49fa546f8363b /bashrc
parentSimplify gitdc (diff)
downloadutil-1b5b1577d8e2af1182404a07f9d1d85ea794e244.tar.bz2
util-1b5b1577d8e2af1182404a07f9d1d85ea794e244.tar.xz
util-1b5b1577d8e2af1182404a07f9d1d85ea794e244.zip
Function to show differences on a branch
Diffstat (limited to 'bashrc')
-rw-r--r--bashrc4
1 files changed, 4 insertions, 0 deletions
diff --git a/bashrc b/bashrc
index 58998b5..3492cfc 100644
--- a/bashrc
+++ b/bashrc
@@ -166,6 +166,10 @@ gitd() {
gitdc() {
gitd "--cached $@"
}
+showdiff() {
+ local feat=${1-HEAD} target=${2-origin/master}
+ diffWith "git diff $target...$feat -w -D -M --patience --find-copies-harder"
+}
gppdmb() {
PARENT=${1:-master}
git checkout $PARENT && git pull --prune && git delete-merged-branches