unpack-trees: oneway_merge to update submodules

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index dfe7d8372723c7a4970b8a7100764d1becc7f830..9f13266a685176bf142d9e381d7a9d10ea12aa7b 100644 (file)
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -194,7 +194,7 @@ different things.
  * The `--index` option is used to ask a command that
    usually works on files in the working tree to *also*
    affect the index.  For example, `git stash apply` usually
-   merges changes recorded in a stash to the working tree,
+   merges changes recorded in a stash entry to the working tree,
    but with the `--index` option, it also merges changes to
    the index as well.