]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Removed newline escape sequence that was not properly being obeyed anyway, was printi...
authorCaleb Maclennan <caleb@alerque.com>
Sun, 20 Oct 2013 01:58:22 +0000 (19:58 -0600)
committerRichard Hartmann <richih@debian.org>
Sun, 27 Oct 2013 11:50:47 +0000 (12:50 +0100)
vcsh

diff --git a/vcsh b/vcsh
index f987fbfd5a24d6df99e8b1ef091a3e27fecdfd08..39240093afd50dd0a47b528abb2249fedf9e1d27 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -163,7 +163,7 @@ clone() {
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
+  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
        git merge origin/master
        hook post-clone
        retire
        git merge origin/master
        hook post-clone
        retire