Typo. Closes: #586233, #588913

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 4fe0c614246adbeb6ae4af324e16a3ee0e9ca9a2..c70382294c4c928e71e93a07078a4ed1ad77f0af 100755 (executable)
--- a/mr
+++ b/mr
@@ -392,7 +392,7 @@ present, mr assumes it is in offline mode.
 =head1 UNTRUSTED MRCONFIG FILES
 
 Since mrconfig files can contain arbitrary shell commands, they can do
 =head1 UNTRUSTED MRCONFIG FILES
 
 Since mrconfig files can contain arbitrary shell commands, they can do

-anything. This flexability is good, but it also allows a malicious mrconfig
+anything. This flexibility is good, but it also allows a malicious mrconfig

 file to delete your whole home directory. Such a file might be contained
 inside a repository that your main ~/.mrconfig checks out and chains to. To
 avoid worries about evil commands in a mrconfig file, mr
 file to delete your whole home directory. Such a file might be contained
 inside a repository that your main ~/.mrconfig checks out and chains to. To
 avoid worries about evil commands in a mrconfig file, mr


@@ -413,7 +413,7 @@ the documentation in the files for details about using them.
 
 =head1 AUTHOR
 
 
 =head1 AUTHOR
 

-Copyright 2007-2009 Joey Hess <joey@kitenet.net>
+Copyright 2007-2010 Joey Hess <joey@kitenet.net>

 
 Licensed under the GNU GPL version 2 or higher.
 
 
 Licensed under the GNU GPL version 2 or higher.
 


@@ -1573,8 +1573,8 @@ hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"

-git_status = git status "$@" || true
-bzr_status = bzr status "$@"
+git_status = git status -s "$@" || true
+bzr_status = bzr status --short "$@"

 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true