summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-05-04 21:50:37 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2012-05-04 21:50:37 +0200
commitcc67e0b3b6b04ca0356834eb68a45b5fda1c220d (patch)
tree3ebb3c35604267545530315488fb962ac3447d9e
parent83e163be220ccb93197e38153570b84ce64c2479 (diff)
downloaddotfiles-cc67e0b3b6b04ca0356834eb68a45b5fda1c220d.tar.gz
dotfiles-cc67e0b3b6b04ca0356834eb68a45b5fda1c220d.tar.xz
dotfiles-cc67e0b3b6b04ca0356834eb68a45b5fda1c220d.zip
bashrc/main: make grep in git-status more strict
-rw-r--r--bashrc/main.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index 3c769b7..cd5c5c4 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -34,7 +34,7 @@ _self_update() {
read _merge;
if [[ $_merge != 'n' ]]; then
_local_commits="$(git rev-list old-origin..HEAD | xargs echo)"
- _local_changes="$(git status | grep Change)"
+ _local_changes="$(git status | grep '^# Change')"
if [[ -n "$_local_commits" ]]; then
echo -e "\033[31m*\033[0m You have some local commits. I will now try to use the new origin/master"