Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
use xstrdup, not strdup in ll-merge.c

diff --combined Documentation/git-svn.txt
index cda3389331edd615cab316574e4dedc5cc30bd31,216c4563f189153ffc135e7f2740c424b419bbf0..d8bf7bfc303af3549c30e199dc0575f8e87e5b9f
--- 1/Documentation/git-svn.txt
--- 2/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -92,30 -92,6 +92,30 @@@ COMMAND
        .git/config file may be specified as an optional command-line
        argument.
  
 +--localtime;;
 +      Store Git commit times in the local timezone instead of UTC.  This
 +      makes 'git-log' (even without --date=local) show the same times
 +      that `svn log` would in the local timezone.
 +
 +This doesn't interfere with interoperating with the Subversion
 +repository you cloned from, but if you wish for your local Git
 +repository to be able to interoperate with someone else's local Git
 +repository, either don't use this option or you should both use it in
 +the same local timezone.
 +
 +--ignore-paths=<regex>;;
 +      This allows one to specify Perl regular expression that will
 +      cause skipping of all matching paths from checkout from SVN.
 +      Examples:
 +
 +      --ignore-paths="^doc" - skip "doc*" directory for every fetch.
 +
 +      --ignore-paths="^[^/]+/(?:branches|tags)" - skip "branches"
 +          and "tags" of first level directories.
 +
 +      Regular expression is not persistent, you should specify
 +      it every time when fetching.
 +
  'clone'::
        Runs 'init' and 'fetch'.  It will automatically create a
        directory based on the basename of the URL passed to it;
@@@ -169,10 -145,6 +169,10 @@@ and have no uncommitted changes
        reused if a user is later given access to an alternate transport
        method (e.g. `svn+ssh://` or `https://`) for commit.
  
 +config key: svn-remote.<name>.commiturl
 +
 +config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
 +
        Using this option for any other purpose (don't ask)
        is very strongly discouraged.
  --
@@@ -503,14 -475,6 +503,14 @@@ svn-remote.<name>.rewriteRoot:
        the repository with a public http:// or svn:// URL in the
        metadata so users of it will see the public URL.
  
 +svn.brokenSymlinkWorkaround::
 +This disables potentially expensive checks to workaround broken symlinks
 +checked into SVN by broken clients.  Set this option to "false" if you
 +track a SVN repository with many empty blobs that are not symlinks.
 +This option may be changed while "git-svn" is running and take effect on
 +the next revision fetched.  If unset, git-svn assumes this option to be
 +"true".
 +
  --
  
  Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps
@@@ -599,7 -563,7 +599,7 @@@ pulled or merged from.  This is becaus
  If you use `git svn set-tree A..B` to commit several diffs and you do
  not have the latest remotes/git-svn merged into my-branch, you should
  use `git svn rebase` to update your work branch instead of `git pull` or
- `git merge`.  `pull`/`merge' can cause non-linear history to be flattened
+ `git merge`.  `pull`/`merge` can cause non-linear history to be flattened
  when committing into SVN, which can lead to merge commits reversing
  previous commits in SVN.