undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mw/doc-typofixes'

Browse Source 
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:
Junio C Hamano 2018-10-16 16:16:09 +09:00
commit 65f1b1bd9f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.txt
View File

@ -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

3
Documentation/technical/api-history-graph.txt
View File

@ -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;