diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 01:17:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 01:17:09 -0800 |
| commit | c0a4ae5caf220f97371e8b2c124d50fdd7663cf1 (patch) | |
| tree | 98160a997763d3e295b3ecbc44de4895ec2d81a3 | |
| parent | aa14a0c3f191ee4df7344eed119be5b4a527a0ff (diff) | |
| parent | a0178ae2cfd79a1da5d7ddfacadb1e41560bb464 (diff) | |
| download | git-c0a4ae5caf220f97371e8b2c124d50fdd7663cf1.tar.gz git-c0a4ae5caf220f97371e8b2c124d50fdd7663cf1.tar.xz | |
Merge branch 'rw/maint-typofix' into rw/typofix
* rw/maint-typofix:
Fix typos in the documentation.
| -rw-r--r-- | Documentation/RelNotes-1.6.0.4.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-commit.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-svn.txt | 2 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt index fba3f30a8..d522661d3 100644 --- a/Documentation/RelNotes-1.6.0.4.txt +++ b/Documentation/RelNotes-1.6.0.4.txt @@ -30,7 +30,7 @@ Fixes since v1.6.0.3 * 'git status' incorrectly reported a submodule directory as an untracked directory. -* 'git svn' used deprecated 'git-foo' form of subcommand invocaition. +* 'git svn' used deprecated 'git-foo' form of subcommand invocation. * 'git update-ref -d' to remove a reference did not honor --no-deref option. diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index a1ce9a8bf..6203461f4 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -95,7 +95,7 @@ OPTIONS -s:: --signoff:: - Add Signed-off-by line by the commiter at the end of the commit + Add Signed-off-by line by the committer at the end of the commit log message. -n:: diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index ba94cd17d..8d0c421b8 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -109,7 +109,7 @@ COMMANDS This works similarly to `svn update` or 'git-pull' except that it preserves linear history with 'git-rebase' instead of -'git-merge' for ease of dcommiting with 'git-svn'. +'git-merge' for ease of dcommitting with 'git-svn'. This accepts all options that 'git-svn fetch' and 'git-rebase' accept. However, '--fetch-all' only fetches from the current diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index c0d8caf46..da9c6b299 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -546,7 +546,7 @@ $ git bisect skip ------------------------------------------------- In this case, though, git may not eventually be able to tell the first -bad one between some first skipped commits and a latter bad commit. +bad one between some first skipped commits and a later bad commit. There are also ways to automate the bisecting process if you have a test script that can tell a good from a bad commit. See |