xsf-tools: Changes to 'master'

[Cyril Brulebois <kibi@alioth.debian.org>]

 mrconfig      |    4 +++-
 mrconfig.head |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b7f2dde1d435403a42417e3f931c64f2e29a9db1
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Nov 18 18:49:38 2010 +0100

    Rename alias for xsf-remote-add-upstream.
    
    Unfortunately, mr does some magic with the aliases, so one can't really
    use underscores to separate words, and trying dashes instead leads to
    parse errors.

diff --git a/mrconfig b/mrconfig
index f3df527..8b48a2d 100644
--- a/mrconfig
+++ b/mrconfig
@@ -17,7 +17,7 @@ git2ssh =
   sed -i 's,git://git.debian.org,ssh://git.debian.org,' $MR_REPO/.git/config
 
 # Make it easy to run this command on all repositories:
-remote_add_upstream =
+remoteaddupstream =
   xsf-remote-add-upstream
 
 
diff --git a/mrconfig.head b/mrconfig.head
index ce99976..792579b 100644
--- a/mrconfig.head
+++ b/mrconfig.head
@@ -17,7 +17,7 @@ git2ssh =
   sed -i 's,git://@@host@@,ssh://@@host@@,' $MR_REPO/.git/config
 
 # Make it easy to run this command on all repositories:
-remote_add_upstream =
+remoteaddupstream =
   xsf-remote-add-upstream
 
 

commit 2c9160e9840e592862b72ca875cbaf060f61492c
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Nov 18 17:44:01 2010 +0100

    Fix spacing.

diff --git a/mrconfig b/mrconfig
index d5850d7..f3df527 100644
--- a/mrconfig
+++ b/mrconfig
@@ -19,6 +19,8 @@ git2ssh =
 # Make it easy to run this command on all repositories:
 remote_add_upstream =
   xsf-remote-add-upstream
+
+
 [app/compiz.git]
 [app/grandr.git]
 [app/intel-gen4asm.git]
diff --git a/mrconfig.head b/mrconfig.head
index ebee71b..ce99976 100644
--- a/mrconfig.head
+++ b/mrconfig.head
@@ -19,3 +19,5 @@ git2ssh =
 # Make it easy to run this command on all repositories:
 remote_add_upstream =
   xsf-remote-add-upstream
+
+