From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 06:50:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5764c095c2a563b657c1bd8f4a3e47bdeee14b0?ds=inline;hp=-c

Merge branch 'maint'

* maint:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
---

c5764c095c2a563b657c1bd8f4a3e47bdeee14b0
diff --combined Documentation/git-svn.txt
index ca3fc3de1f,74be8435cc..bb22d8e712
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -398,14 -398,6 +398,14 @@@ after the authors-file is modified shou
  
  config key: svn.authorsfile
  
 +--authors-prog=<filename>::
 +
 +If this option is specified, for each SVN committer name that does not
 +exist in the authors file, the given file is executed with the committer
 +name as the first argument.  The program is expected to return a single
 +line of the form "Name <email>", which will be treated as if included in
 +the authors file.
 +
  -q::
  --quiet::
  	Make 'git-svn' less verbose. Specify a second time to make it
@@@ -623,7 -615,7 +623,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.