git/Documentation/git-reset.txt, branch v2.21.3

doc: tidy asciidoc style

2019-01-23T19:37:29Z

This mainly refers to enforcing indentation on additional lines of items of lists. Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano

Merge branch 'ma/reset-doc-rendering-fix'

2018-12-01T12:41:43Z

Doc updates. * ma/reset-doc-rendering-fix: git-reset.txt: render literal examples as monospace git-reset.txt: render tables correctly under Asciidoctor

git-reset.txt: render literal examples as monospace

2018-11-29T06:44:18Z

Large parts of this document do not use `backticks` around literal examples such as branch names (`topic/wip`), git usages, `HEAD` and `` so they render as ordinary text. Fix that. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano

git-reset.txt: render tables correctly under Asciidoctor

2018-11-29T06:44:15Z

Asciidoctor removes the indentation of each line in these tables, so the last lines of each table have a completely broken alignment. Similar to 379805051d ("Documentation: render revisions correctly under Asciidoctor", 2018-05-06), use an explicit literal block to indicate that we want to keep the leading whitespace in the tables. Because this gives us some extra indentation, we can remove the one that we have been carrying explicitly. That is, drop the first six spaces of indentation on each line. With Asciidoc (8.6.10), this results in identical rendering before and after this commit, both for git-reset.1 and git-reset.html. Reported-by: Paweł Samoraj Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano

reset: add new reset.quiet config setting

2018-10-24T02:57:07Z

Add a reset.quiet config setting that sets the default value of the --quiet flag when running the reset command. This enables users to change the default behavior to take advantage of the performance advantages of avoiding the scan for unstaged changes after reset. Defaults to false. Signed-off-by: Ben Peart Signed-off-by: Junio C Hamano

Spelling fixes

2017-06-27T17:35:49Z

Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

doc: git-reset: fix a trivial typo

2017-06-15T20:42:58Z

Signed-off-by: Štěpán Němec Signed-off-by: Junio C Hamano

reset: add an example of how to split a commit into two

2017-02-16T21:38:02Z

It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git-reset documentation which shows an example process for how to use git add -p and git commit -c HEAD@{1} to interactively break a commit apart and re-use the original commit message as a starting point when making the new commit message. Signed-off-by: Jacob Keller Signed-off-by: Junio C Hamano

Revert "reset: add an example of how to split a commit into two"

2017-02-16T21:35:50Z

This reverts commit 7326451bedaa67d29afe02184b166e28d9393c91; a better rewrite will be queued separately.

reset: add an example of how to split a commit into two

2017-02-04T06:31:47Z