summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:09 (GMT)
commit65f1b1bd9f88e041ba21e9c0230be5ba44962b5d (patch)
tree7295080d6df931bd244c70838fd1cc8df61dfc66
parent29cce957a7e58ed016e6699f069c713a2f188660 (diff)
parentad0b8f9575a4fd5b21c4903871ea8bae09878ec5 (diff)
downloadgit-65f1b1bd9f88e041ba21e9c0230be5ba44962b5d.zip
git-65f1b1bd9f88e041ba21e9c0230be5ba44962b5d.tar.gz
git-65f1b1bd9f88e041ba21e9c0230be5ba44962b5d.tar.bz2
Merge branch 'mw/doc-typofixes'
Typofixes. * mw/doc-typofixes: docs: typo: s/isimilar/similar/ docs: graph: remove unnecessary `graph_update()' call docs: typo: s/go/to/
-rw-r--r--Documentation/git-rebase.txt2
-rw-r--r--Documentation/technical/api-history-graph.txt3
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 1fbc6eb..432baab 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -954,7 +954,7 @@ command fails, it is rescheduled immediately, with a helpful message how
to proceed.
The `reset` command resets the HEAD, index and worktree to the specified
-revision. It is isimilar to an `exec git reset --hard <label>`, but
+revision. It is similar to an `exec git reset --hard <label>`, but
refuses to overwrite untracked files. If the `reset` command fails, it is
rescheduled immediately, with a helpful message how to edit the todo list
(this typically happens when a `reset` command was inserted into the todo
diff --git a/Documentation/technical/api-history-graph.txt b/Documentation/technical/api-history-graph.txt
index 18142b6..d0d1707 100644
--- a/Documentation/technical/api-history-graph.txt
+++ b/Documentation/technical/api-history-graph.txt
@@ -80,7 +80,7 @@ Calling sequence
it is invoked.
* For each commit, call `graph_next_line()` repeatedly, until
- `graph_is_commit_finished()` returns non-zero. Each call go
+ `graph_is_commit_finished()` returns non-zero. Each call to
`graph_next_line()` will output a single line of the graph. The resulting
lines will not contain any newlines. `graph_next_line()` returns 1 if the
resulting line contains the current commit, or 0 if this is merely a line
@@ -115,7 +115,6 @@ struct commit *commit;
struct git_graph *graph = graph_init(opts);
while ((commit = get_revision(opts)) != NULL) {
- graph_update(graph, commit);
while (!graph_is_commit_finished(graph))
{
struct strbuf sb;