diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
| commit | 3b4609d029e2db42b5154f019facecee49196bf0 (patch) | |
| tree | 6d059b8455a973760f1680791fbdf8c453fe387e /user-manual.txt | |
| parent | 442206cbc570d6bc05423bd8a54db5f06d740c65 (diff) | |
| download | git-htmldocs-3b4609d029e2db42b5154f019facecee49196bf0.tar.gz | |
Autogenerated HTML docs for v1.7.3.1-45-g9855
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user-manual.txt b/user-manual.txt index fecc4eb5b..ce45bfcc0 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -955,7 +955,7 @@ echo "git diff --stat --summary -M v$last v$new > ../diffstat-$new" and then he just cut-and-pastes the output commands after verifying that they look OK. -[[Finding-comments-With-given-Content]] +[[Finding-commits-With-given-Content]] Finding commits referencing a file with given content ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2439,9 +2439,9 @@ You have performed no merges into mywork, so it is just a simple linear sequence of patches on top of "origin": ................................................ - o--o--o <-- origin + o--o--O <-- origin \ - o--o--o <-- mywork + a--b--c <-- mywork ................................................ Some more interesting work has been done in the upstream project, and |