summaryrefslogtreecommitdiffstats
path: root/repo-access.sh
diff options
context:
space:
mode:
authorMalf Furious <m@lfurio.us>2018-10-09 22:30:34 -0400
committerMalf Furious <m@lfurio.us>2018-10-09 22:30:34 -0400
commit9f3b98c7cc7e04369367e97a9cb328443ad9f0c0 (patch)
treeed288c392509ad87e1e112faf695c09b0c73f555 /repo-access.sh
parent942d22a2fec76dcadc34225f7c8ce80d286e52df (diff)
parentb61e56981dd705b56496090972d085a8b77d5366 (diff)
downloadsystrunk-master.tar.gz
systrunk-master.zip
Merge branch 'diff'HEADv0.2master
Diffstat (limited to 'repo-access.sh')
-rw-r--r--repo-access.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/repo-access.sh b/repo-access.sh
index 3e9fa8d..3685318 100644
--- a/repo-access.sh
+++ b/repo-access.sh
@@ -193,12 +193,13 @@ function systr_init
}
##
-# systrunk status
+# systrunk status [-d]
#
# View current information such as which branch your worktree is
# TRACking, which commit it is BASEd on, and how far out-of-date
# it is. Additionally, report whether a merge or update operation
-# is currently in-progress.
+# is currently in-progress. If '-d' is given, status will be
+# accompanied by a shortdiff of pending, uncommitted changes.
##
function systr_status
{
@@ -237,4 +238,9 @@ function systr_status
echo "Behind $dist commits"
fi
fi
+
+ if [[ "$1" == "-d" ]]; then
+ echo ""
+ systrunk shortdiff && echo "No pending changes"
+ fi
}