diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-17 17:42:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-17 17:42:30 +0000 |
| commit | f9771f69968326f60eaa1b69efe27a302998c755 (patch) | |
| tree | 14f148fe4a54b0f8dfccc83b7dbd37034216d385 /git-rerere.txt | |
| parent | 8f76dc6fae3bb5536b36c987aa521322dcdd220c (diff) | |
| download | git-htmldocs-f9771f69968326f60eaa1b69efe27a302998c755.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g23bf
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 08a055713..c65c59e86 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -38,7 +38,7 @@ its working state. This resets the metadata used by rerere if a merge resolution is to be is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1] -[--skip|--abort] will automatcally invoke this command. +[--skip|--abort] will automatically invoke this command. 'diff':: |