[PATCH 1/1] Documentation: fix a bunch of typos, both old and new

From: Elijah Newren Signed-off-by: Elijah Newren --- Documentation/CodingGuidelines | 2 +- Documentation/RelNotes/1.7.0.2.txt | 2 +- Documentation/RelNotes/1.7.10.4.txt| 2 +- Documentation/RelNotes/1.7.12.3.txt| 2 +- Do

[PATCH 0/1] Thyme two ficks sum Documentaton tyops and speling erors!

We have a number of typos and spelling errors that I spotted under Documentation/. It'd be nice if someone could double check that I placed the missing right parenthesis correctly in Documentation/technical/api-trace2.txt. Also, not sure if folks would be happy or unhappy with me un-splitting a wo

[PATCH v2 0/3] Dir rename fixes

This series improves a couple things found after looking into things Dscho flagged: * clarify and slightly restructure code in the get_renamed_dir_portion() function * extend support of detecting renaming/merging of one directory into another to support the root directory as a target direc

[PATCH v2 2/3] merge-recursive: fix merging a subdirectory into the root directory

From: Elijah Newren We allow renaming all entries in e.g. a directory named z/ into a directory named y/ to be detected as a z/ -> y/ rename, so that if the other side of history adds any files to the directory z/ in the mean time, we can provide the hint that they should be moved to y/. There i

[PATCH v2 3/3] t604[236]: do not run setup in separate tests

From: Elijah Newren Transform the setup "tests" to setup functions, and have the actual tests call the setup functions. Advantages: * Should make life easier for people working with webby CI/PR builds who have to abuse mice (and their own index finger as well) in order to switch from

[PATCH v2 1/3] merge-recursive: clean up get_renamed_dir_portion()

From: Elijah Newren Dscho noted a few things making this function hard to follow. Restructure it a bit and add comments to make it easier to follow. The restructurings include: * There was a special case if-check at the end of the function checking whether someone just renamed a file with

[PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

From: Elijah Newren We allow renaming all entries in e.g. a directory named z/ into a directory named y/ to be detected as a z/ -> y/ rename, so that if the other side of history adds any files to the directory z/ in the mean time, we can provide the hint that they should be moved to y/. There i

[PATCH 1/2] merge-recursive: clean up get_renamed_dir_portion()

From: Elijah Newren Dscho noted a few things making this function hard to follow. Restructure it a bit and add comments to make it easier to follow. The restructurings include: * There was a special case if-check at the end of the function checking whether someone just renamed a file with

[PATCH 0/2] Dir rename fixes

This series improves a couple things found after looking into things Dscho flagged: * clarify and slightly restructure code in the get_renamed_dir_portion() function * extend support of detecting renaming/merging of one directory into another to support the root directory as a target direc

[PATCH 1/1] git-show-ref.txt: fix order of flags

From: Elijah Newren When the explanatory text uses the term "respectively", the order of flags is important. Signed-off-by: Elijah Newren --- Documentation/git-show-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-show-ref.txt b/Documentation/git-sh

[PATCH 0/1] git-show-ref.txt: fix order of flags

A trivial documentation fix...and testing out gitgitgadget. :-) Elijah Newren (1): git-show-ref.txt: fix order of flags Documentation/git-show-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ecbdaf0899161c067986e9d9d564586d4b045d62 Published-As: https://github.com