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

Merge branch 'master' of github.com:RichiH/vcsh
authorRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 27 Oct 2011 21:25:36 +0000 (23:25 +0200)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 27 Oct 2011 21:25:36 +0000 (23:25 +0200)
Conflicts:
INSTALL

1  2 
INSTALL

diff --cc INSTALL
index 498719124b50f120a5e03cd759647ec4a324960c,5ac7510f7c84980228f0ede52fce0fca3abaf95f..13f7b328825cfeed4fcc4729d8dca124fa744ca7
+++ b/INSTALL
@@@ -107,16 -84,17 +107,14 @@@ This is how my old setup procedure look
      sudo ln -s ~/work/git/vcsh/vcsh /usr/bin/local
      hash -r
  
-     # Grab my mr config. See below for details on how I set this up.
-     ~/work/git/vcsh/vcsh clone ssh://<remote>/mr.git
 -# Grab my mr config. see below for details on how I set this up
++Grab my mr config. see below for details on how I set this up
++
+     vcsh clone ssh://<remote>/mr.git
      cd ~/.config/mr/config.d/
      ln -s ../available.d/* .
  
- ----------------
- # The old tutorial (?) #
  
-     # mr is used to actually retrieve configs, etc
 -
 -
 -################
 -
 -# mr is used to actually retrieve configs, etc
++mr is used to actually retrieve configs, etc
  
      ~ % cat ~/.mrconfig
      [DEFAULT]