delta/git.git/Documentation/git-reset.txt, branch hv/mv-nested-submodules-test

Spelling fixes

2017-06-27T17:35:49+00:00

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

doc: git-reset: fix a trivial typo

2017-06-15T20:42:58+00:00

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:02+00:00

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:50+00:00

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:47+00:00

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

Merge branch 'jl/nor-or-nand-and'

2014-04-08T19:00:28+00:00

Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.

* jl/nor-or-nand-and:
  code and test: fix misuses of "nor"
  comments: fix misuses of "nor"
  contrib: fix misuses of "nor"
  Documentation: fix misuses of "nor"

Documentation: fix misuses of "nor"

2014-03-31T22:16:22+00:00

Signed-off-by: Justin Lebar 
Signed-off-by: Junio C Hamano

reset: support "--mixed --intent-to-add" mode

2014-02-06T00:44:51+00:00

When --mixed is used, entries could be removed from index if the
target ref does not have them. When "reset" is used in preparation for
commit spliting (in a dirty worktree), it could be hard to track what
files to be added back. The new option --intent-to-add simplifies it
by marking all removed files intent-to-add.

Signed-off-by: Nguyễn Thái Ngọc Duy

Documentation: "git reset " takes a tree-ish, not tree-sh

2013-07-19T17:15:09+00:00

Reported-By: Ibrahim M. Ghazal 
Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

reset: update documentation to require only tree-ish with paths

2013-01-16T20:50:23+00:00

When resetting with paths, we no longer require a commit argument, but
only a tree-ish. Update the documentation and synopsis accordingly.

Signed-off-by: Martin von Zweigbergk 
Signed-off-by: Junio C Hamano