Leftover in paths touched by [5/6]. Documentation/gitcvs-migration.txt | 2 +- Documentation/technical/api-builtin.txt | 2 +- Documentation/technical/api-credentials.txt | 4 ++-- Documentation/technical/api-remote.txt | 2 +- Documentation/urls.txt | 2 +- Documentation/user-manual.txt | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index 2934ac2..5ab5b07 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -3,7 +3,7 @@ gitcvs-migration(7) NAME ---- -gitcvs-migration - git for CVS users +gitcvs-migration - Git for CVS users SYNOPSIS -------- diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index 2d27ff1..4a4228b 100644 --- a/Documentation/technical/api-builtin.txt +++ b/Documentation/technical/api-builtin.txt @@ -5,7 +5,7 @@ Adding a new built-in --------------------- There are 4 things to do to add a built-in command implementation to -git: +Git: . Define the implementation of the built-in command `foo` with signature: diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index f0c39e1..516fda7 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -18,7 +18,7 @@ Typical setup ------------ +-----------------------+ -| git code (C) |--- to server requiring ---> +| Git code (C) |--- to server requiring ---> | | authentication |.......................| | C credential API |--- prompt ---> User @@ -27,7 +27,7 @@ Typical setup | pipe | | v +-----------------------+ -| git credential helper | +| Git credential helper | +-----------------------+ ------------ diff --git a/Documentation/technical/api-remote.txt b/Documentation/technical/api-remote.txt index 2819d3a..4be8776 100644 --- a/Documentation/technical/api-remote.txt +++ b/Documentation/technical/api-remote.txt @@ -45,7 +45,7 @@ struct remote `receivepack`, `uploadpack`:: The configured helper programs to run on the remote side, for - git-native protocols. + Git-native protocols. `http_proxy`:: diff --git a/Documentation/urls.txt b/Documentation/urls.txt index a2cf68b..539c0a0 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -29,7 +29,7 @@ The ssh and git protocols additionally support ~username expansion: - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/ - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/ -For local repositories, also supported by git natively, the following +For local repositories, also supported by Git natively, the following syntaxes may be used: - /path/to/repo.git/ diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index dda262a..5077e7c 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1439,7 +1439,7 @@ fundamentally different ways to fix the problem: 2. You can go back and modify the old commit. You should never do this if you have already made the history public; - git does not normally expect the "history" of a project to + Git does not normally expect the "history" of a project to change, and cannot correctly perform repeated merges from a branch that has had its history changed. @@ -3671,7 +3671,7 @@ Unable to checkout '261dfac35cb99d380eb966e102c1197139f7fa24' in submodule path In older Git versions it could be easily forgotten to commit new or modified files in a submodule, which silently leads to similar problems as not pushing -the submodule changes. Starting with git 1.7.0 both "git status" and "git diff" +the submodule changes. Starting with Git 1.7.0 both "git status" and "git diff" in the superproject show submodules as modified when they contain new or modified files to protect against accidentally committing such a state. "git diff" will also add a "-dirty" to the work tree side when generating patch -- 1.8.1.1.507.g1754052 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html