X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fuser-manual.txt;h=ce45bfcc04f2a038e7ab2a331b5ea25f5db3a65a;hb=e7cf4e94c6f147953af4d079ca2e9ef0d7a29ae9;hp=fecc4eb5b3b853f4781c769fff8337e8bb6c3500;hpb=c208e05bd9880028c980fafbc5dda3d17a603ac1;p=git.git diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index fecc4eb5b..ce45bfcc0 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/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