From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 2 Apr 2011 00:45:59 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc1~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/142c945e6e6d944aff4187c55c3655d9608ca376?ds=inline;hp=-c

Merge branch 'maint'

* maint:
docs: fix filter-branch subdir example for exotic repo names
---

142c945e6e6d944aff4187c55c3655d9608ca376
diff --combined Documentation/git-filter-branch.txt
index 03c76c717a,aa69b8ef13..9dc1f2a947
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@@ -361,7 -361,7 +361,7 @@@ git filter-branch --index-filter 
  	'git ls-files -s | sed "s-\t\"*-&newsubdir/-" |
  		GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
  			git update-index --index-info &&
- 	 mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD
+ 	 mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
  ---------------------------------------------------------------
  
  
@@@ -405,6 -405,16 +405,6 @@@ warned
    (or if your git-gc is not new enough to support arguments to
    `\--prune`, use `git repack -ad; git prune` instead).
  
 -
 -Author
 -------
 -Written by Petr "Pasky" Baudis <pasky@suse.cz>,
 -and the git list <git@vger.kernel.org>
 -
 -Documentation
 ---------------
 -Documentation by Petr Baudis and the git list.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite