From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 29 Oct 2023 22:09:55 +0000 (+0900)
Subject: Merge branch 'sn/typo-grammo-phraso-fixes'
X-Git-Tag: v2.43.0-rc0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8183b63ff6a9c7eec5555e51e127e712efb64704;p=thirdparty%2Fgit.git

Merge branch 'sn/typo-grammo-phraso-fixes'

Many typos, ungrammatical sentences and wrong phrasing have been
fixed.

* sn/typo-grammo-phraso-fixes:
  t/README: fix multi-prerequisite example
  doc/gitk: s/sticked/stuck/
  git-jump: admit to passing merge mode args to ls-files
  doc/diff-options: improve wording of the log.diffMerges mention
  doc: fix some typos, grammar and wording issues
---

8183b63ff6a9c7eec5555e51e127e712efb64704
diff --cc Documentation/diff-options.txt
index 1a75c28bca,48a5012748..53ec3c9a34
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -74,37 -48,32 +74,37 @@@ off, none:
  	Disable output of diffs for merge commits. Useful to override
  	implied value.
  +
 ---diff-merges=on:::
 ---diff-merges=m:::
 --m:::
 -	This option makes diff output for merge commits to be shown in
 -	the default format. `-m` will produce the output only if `-p`
 -	is given as well. The default format can be specified using
 -	the configuration variable `log.diffMerges` (see
 -	linkgit:git-config[1]). It defaults to `separate`.
 -+
 ---diff-merges=first-parent:::
 ---diff-merges=1:::
 -	This option makes merge commits show the full diff with
 -	respect to the first parent only.
 -+
 ---diff-merges=separate:::
 -	This makes merge commits show the full diff with respect to
 -	each of the parents. Separate log entry and diff is generated
 -	for each parent.
 -+
 ---diff-merges=remerge:::
 ---diff-merges=r:::
 ---remerge-diff:::
 -	With this option, two-parent merge commits are remerged to
 -	create a temporary tree object -- potentially containing files
 -	with conflict markers and such.  A diff is then shown between
 -	that temporary tree and the actual merge commit.
 +on, m::
 +	Make diff output for merge commits to be shown in the default
- 	format. The default format could be changed using
++	format. The default format can be changed using
 +	`log.diffMerges` configuration variable, whose default value
 +	is `separate`.
 ++
 +first-parent, 1::
 +	Show full diff with respect to first parent. This is the same
 +	format as `--patch` produces for non-merge commits.
 ++
 +separate::
 +	Show full diff with respect to each of parents.
 +	Separate log entry and diff is generated for each parent.
 ++
 +combined, c::
 +	Show differences from each of the parents to the merge
 +	result simultaneously instead of showing pairwise diff between
 +	a parent and the result one at a time. Furthermore, it lists
 +	only files which were modified from all parents.
 ++
 +dense-combined, cc::
 +	Further compress output produced by `--diff-merges=combined`
 +	by omitting uninteresting hunks whose contents in the parents
 +	have only two variants and the merge result picks one of them
 +	without modification.
 ++
 +remerge, r::
 +	Remerge two-parent merge commits to create a temporary tree
 +	object--potentially containing files with conflict markers
 +	and such.  A diff is then shown between that temporary tree
 +	and the actual merge commit.
  +
  The output emitted when this option is used is subject to change, and
  so is its interaction with other options (unless explicitly