From: Richard Hartmann <richih@debian.org>
Date: Mon, 18 May 2015 07:21:25 +0000 (+0200)
Subject: Merge branch 'feature/status_--terse'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/6087288c06101723633289aa9af31fad8729b605?hp=6c3fa632c62fc3e381ba8404692d24cfad290ad7

Merge branch 'feature/status_--terse'
---

diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 29c9889..65fc5f3 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -14,6 +14,12 @@ There are no other dependencies other than `git`, `ronn` and a POSIX shell.
 
 	sudo make install
 
+## Installing without root privileges ##
+
+	make install DESTDIR=/home/myuser/local
+
+or simply copy the shell script into any place you like, e.g. `~/bin`
+
 
 # Uninstalling #
 
diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index cd73ca8..19daed5 100644
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -339,7 +339,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann.
 
 ## COPYRIGHT
 
-Copyright 2011-2013 Richard Hartmann <richih@debian.org>
+Copyright 2011-2015 Richard Hartmann <richih@debian.org>
 
 Licensed under the GNU GPL version 2 or higher.
 
diff --git a/vcsh b/vcsh
index a630f97..8bfafab 100755
--- a/vcsh
+++ b/vcsh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014
+# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015
 # For details, see LICENSE. To submit patches, you have to agree to
 # license your code under the GNU GPL version 2 or later.
 
@@ -313,7 +313,7 @@ list_untracked_helper() {
 		cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
 	fi
 	cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
-	comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+	comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 }
 
 pull() {