]> 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:

projects / code / vcsh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de12e5 cb24803)
Merge pull request #129 from tfnico/patch-5
authorRichard Hartmann <RichiH@users.noreply.github.com>
Wed, 7 May 2014 06:39:42 +0000 (08:39 +0200)
committerRichard Hartmann <RichiH@users.noreply.github.com>
Wed, 7 May 2014 06:39:42 +0000 (08:39 +0200)
Suggest shorter form of vcsh pull

1  2 
vcsh patch | diff1 | diff2 | blob | history

diff --cc vcsh
index 18cd9e542097cbc006e9287e5730b130bc10e2a3,6e18e16b78d9762d2fe4d827677e1701d1908839..31a60194de79ecfdec0da5a3de7e4be2df6d4218
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -159,9 -159,9 +159,9 @@@ clone() 
                        error "'$object' exists." &&
                        VCSH_CONFLICT=1
        done
 -      [ "$VCSH_CONFLICT" = '1' ]) &&
 +      [ x"$VCSH_CONFLICT" = x'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." 17
+   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
        git merge origin/master
        hook post-merge
        hook post-clone
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.