From: Richard Hartmann Date: Thu, 27 Oct 2011 21:25:36 +0000 (+0200) Subject: Merge branch 'master' of github.com:RichiH/vcsh X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/9430c6d15909f3e058f0ef1dbdd27e5f3e650ff9?hp=--cc Merge branch 'master' of github.com:RichiH/vcsh Conflicts: INSTALL --- 9430c6d15909f3e058f0ef1dbdd27e5f3e650ff9 diff --cc INSTALL index 4987191,5ac7510..13f7b32 --- a/INSTALL +++ 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:///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:///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]