mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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/
This commit is contained in:
commit
65f1b1bd9f
|
@ -954,7 +954,7 @@ command fails, it is rescheduled immediately, with a helpful message how
|
||||||
to proceed.
|
to proceed.
|
||||||
|
|
||||||
The `reset` command resets the HEAD, index and worktree to the specified
|
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
|
refuses to overwrite untracked files. If the `reset` command fails, it is
|
||||||
rescheduled immediately, with a helpful message how to edit the todo list
|
rescheduled immediately, with a helpful message how to edit the todo list
|
||||||
(this typically happens when a `reset` command was inserted into the todo
|
(this typically happens when a `reset` command was inserted into the todo
|
||||||
|
|
|
@ -80,7 +80,7 @@ Calling sequence
|
||||||
it is invoked.
|
it is invoked.
|
||||||
|
|
||||||
* For each commit, call `graph_next_line()` repeatedly, until
|
* 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
|
`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
|
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
|
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);
|
struct git_graph *graph = graph_init(opts);
|
||||||
|
|
||||||
while ((commit = get_revision(opts)) != NULL) {
|
while ((commit = get_revision(opts)) != NULL) {
|
||||||
graph_update(graph, commit);
|
|
||||||
while (!graph_is_commit_finished(graph))
|
while (!graph_is_commit_finished(graph))
|
||||||
{
|
{
|
||||||
struct strbuf sb;
|
struct strbuf sb;
|
||||||
|
|
Loading…
Reference in a new issue