summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2012-07-16 18:18:20 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2012-07-16 18:18:20 +0200
commit11fad8d13ac2a68ef576ee16591c2fcbadc7592b (patch)
tree78f2713d6c3540817f95562078eff5162519214f
parentf56cbb49ea403b61662ae501c1e78cbf98969adf (diff)
downloaddotfiles-11fad8d13ac2a68ef576ee16591c2fcbadc7592b.tar.gz
dotfiles-11fad8d13ac2a68ef576ee16591c2fcbadc7592b.tar.xz
dotfiles-11fad8d13ac2a68ef576ee16591c2fcbadc7592b.zip
bashrc/main: some optimization
-rw-r--r--bashrc/main.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index 9883ca9..b02c29d 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -45,8 +45,8 @@ _self_update() {
read _merge;
if [[ $_merge != 'n' ]]; then
_local_changes="$(git status | grep '^# Change')"
- _old_origin="$(git rev-list old-origin | head -n1)"
- _old_head="$(git rev-list HEAD | head -n1)"
+ _old_origin="$(git rev-list -n1 old-origin)"
+ _old_head="$(git rev-list -n1 HEAD)"
if [[ "$_old_origin" != "$_old_head" ]]; then
echo -e "\033[31m*\033[0m You have some local commits. I will now try to rebase them"