Merge branch 'sn/doc-typofix'

* sn/doc-typofix:
doc: A few minor copy edits.

diff --combined Documentation/git-rebase.txt
index b30ed352e5a3f87d24119624966c33b4c194df5a,2cab7e21bad470805342b1c9b7cd604534475a35..fd535b06abf85ae166413ad0d24226240f8dd066
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -10,7 -10,7 +10,7 @@@ SYNOPSI
  [verse]
  'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
        [<upstream>] [<branch>]
 -'git rebase' [-i | --interactive] [options] [--exec <cmd>] --onto <newbase>
 +'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
        --root [<branch>]
  'git rebase' --continue | --skip | --abort
  
@@@ -273,7 -273,7 +273,7 @@@ which makes little sense
        Pass the <strategy-option> through to the merge strategy.
        This implies `--merge` and, if no strategy has been
        specified, `-s recursive`.  Note the reversal of 'ours' and
-       'theirs' as noted in above for the `-m` option.
+       'theirs' as noted above for the `-m` option.
  
  -q::
  --quiet::
@@@ -369,11 -369,10 +369,11 @@@ squash/fixup series
  --root::
        Rebase all commits reachable from <branch>, instead of
        limiting them with an <upstream>.  This allows you to rebase
 -      the root commit(s) on a branch.  Must be used with --onto, and
 +      the root commit(s) on a branch.  When used with --onto, it
        will skip changes already contained in <newbase> (instead of
 -      <upstream>).  When used together with --preserve-merges, 'all'
 -      root commits will be rewritten to have <newbase> as parent
 +      <upstream>) whereas without --onto it will operate on every change.
 +      When used together with both --onto and --preserve-merges,
 +      'all' root commits will be rewritten to have <newbase> as parent
        instead.
  
  --autosquash::