summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-27 10:33:49 +0200
committerJunio C Hamano <gitster@pobox.com>2007-08-28 09:10:21 +0200
commit170c04383bca07fb5a32227474dfd58f29258d25 (patch)
tree667334f49e0f103df639a735e75af72465505e3c /Documentation
parentgit-merge: do up-to-date check also for all strategies (diff)
downloadgit-170c04383bca07fb5a32227474dfd58f29258d25.tar.xz
git-170c04383bca07fb5a32227474dfd58f29258d25.zip
Porcelain level "log" family should recurse when diffing.
Most notably, "git log --name-status" stopped at top level directory changes without "-r" option. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/user-manual.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1e6dbd93b1..5ec547cc0c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -96,7 +96,7 @@ git log --since="2 weeks ago" \-- gitk::
The "--" is necessary to avoid confusion with the *branch* named
'gitk'
-git log -r --name-status release..test::
+git log --name-status release..test::
Show the commits that are in the "test" branch but not yet
in the "release" branch, along with the list of paths
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 06ab79fbd1..35298e626b 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -921,7 +921,7 @@ file such that it contained the given content either before or after the
commit. You can find out with this:
-------------------------------------------------
-$ git log --raw -r --abbrev=40 --pretty=oneline -- filename |
+$ git log --raw --abbrev=40 --pretty=oneline -- filename |
grep -B 1 `git hash-object filename`
-------------------------------------------------