Merge branch 'kb/am-deprecate-resolved'

Promote "git am --continue" over "git am --resolved" for UI
consistency.

* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue

diff --combined Documentation/user-manual.txt
index 1bcf11b3971e7c09128f043b560c66af41332d79,faa7251c11d8745b7a646a9bf6a13200fe598ddf..e364007d7c2e5f9b1aa5472c7968cb248eb8cf3f
--- 1/Documentation/user-manual.txt
--- 2/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -66,8 -66,8 +66,8 @@@ $ git clone git://git.kernel.org/pub/sc
  The initial clone may be time-consuming for a large project, but you
  will only need to clone once.
  
 -The clone command creates a new directory named after the project (`git`
 -or `linux-2.6` in the examples above).  After you cd into this
 +The clone command creates a new directory named after the project
 +(`git` or `linux` in the examples above).  After you cd into this
  directory, you will see that it contains a copy of the project files,
  called the <<def_working_tree,working tree>>, together with a special
  top-level directory named `.git`, which contains all the information
@@@ -431,25 -431,19 +431,25 @@@ You can also track branches from reposi
  cloned from, using linkgit:git-remote[1]:
  
  -------------------------------------------------
 -$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
 -$ git fetch linux-nfs
 -* refs/remotes/linux-nfs/master: storing branch 'master' ...
 -  commit: bf81b46
 +$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
 +$ git fetch staging
 +...
 +From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
 + * [new branch]      master     -> staging/master
 + * [new branch]      staging-linus -> staging/staging-linus
 + * [new branch]      staging-next -> staging/staging-next
  -------------------------------------------------
  
  New remote-tracking branches will be stored under the shorthand name
 -that you gave `git remote add`, in this case `linux-nfs`:
 +that you gave `git remote add`, in this case `staging`:
  
  -------------------------------------------------
  $ git branch -r
 -linux-nfs/master
 -origin/master
 +  origin/HEAD -> origin/master
 +  origin/master
 +  staging/master
 +  staging/staging-linus
 +  staging/staging-next
  -------------------------------------------------
  
  If you run `git fetch <remote>` later, the remote-tracking branches
@@@ -461,9 -455,9 +461,9 @@@ a new stanza
  -------------------------------------------------
  $ cat .git/config
  ...
 -[remote "linux-nfs"]
 -      url = git://linux-nfs.org/pub/nfs-2.6.git
 -      fetch = +refs/heads/*:refs/remotes/linux-nfs/*
 +[remote "staging"]
 +      url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 +      fetch = +refs/heads/*:refs/remotes/staging/*
  ...
  -------------------------------------------------
  
@@@ -1841,7 -1835,7 +1841,7 @@@ Once the index is updated with the resu
  resolution, instead of creating a new commit, just run
  
  -------------------------------------------------
- $ git am --resolved
+ $ git am --continue
  -------------------------------------------------
  
  and Git will create the commit for you and continue applying the
@@@ -2162,7 -2156,7 +2162,7 @@@ To set this up, first create your work 
  tree:
  
  -------------------------------------------------
 -$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
 +$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
  $ cd work
  -------------------------------------------------
  
@@@ -2204,7 -2198,7 +2204,7 @@@ make it easy to push both branches to y
  -------------------------------------------------
  $ cat >> .git/config <<EOF
  [remote "mytree"]
 -      url =  master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 +      url =  master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
        push = release
        push = test
  EOF