In Examples, explain option -r and refer to git-rev-list[1]
PATCH 1/1 In Examples, explain option -r and refer to git-rev-list[1]
--- Documentation/git-log.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
Documentation/git-log.txt +2 -1
@@ -76,7 +76,8 @@ git log -r --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 - each commit modifies. + each commit modifies. Opton -r (see gitlink:git-rev-list[1]) + descends recursively. Discussion ----------
Signature · 1 line
1.5.3.rc5
Quoted 10 lines · Jari Aalto
Signed-off-by Jari Aalto <[email protected]>--- Documentation/git-log.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)Documentation/git-log.txt +0
-0
Documentation/git-log.txt git log -r --name-status release..test:: · line 79
Quoted 5 lines
Documentation/git-log.txt +1
-1@@ -76,7 +76,8 @@ git log -r --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 - each commit modifies. + each commit modifies. Opton -r (see gitlink:git-rev-list[1])
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)
/Lukas
Quoted 12 lines · Lukas Sandström
Quoted 11 lines · Jari Aalto
Signed-off-by Jari Aalto <[email protected]>--- Documentation/git-log.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)Documentation/git-log.txt +0
-0@@ -76,7 +76,8 @@ git log -r --name-status release..test::
Quoted 5 lines
Documentation/git-log.txt git log -r --name-status release..test:: · line 79
Quoted 4 lines
Documentation/git-log.txt +1
-1Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths - each commit modifies. + each commit modifies. Opton -r (see gitlink:git-rev-list[1])^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)
I think it makes more sense to make Porcelain including "git log" to always recurse in its diff operations (when diff output is asked for), in which case the example should simply lose the "-r" option.
But that is a post-1.5.3 change. That's why I am planning to drop this patch for now.
Quoted 20 lines · Junio C Hamano
Quoted 12 lines · Lukas Sandström
Quoted 11 lines · Jari Aalto
Signed-off-by Jari Aalto <[email protected]>--- Documentation/git-log.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)Documentation/git-log.txt +0
-0@@ -76,7 +76,8 @@ git log -r --name-status release..test::Quoted 5 lines
Documentation/git-log.txt git log -r --name-status release..test:: · line 79
Quoted 4 lines
Documentation/git-log.txt +1
-1Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths - each commit modifies. + each commit modifies. Opton -r (see gitlink:git-rev-list[1])^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)
Quoted 7 lines
I think it makes more sense to make Porcelain including "git log" to always recurse in its diff operations (when diff output is asked for), in which case the example should simply lose the "-r" option.
But that is a post-1.5.3 change. That's why I am planning to drop this patch for now.
The change would probably look something like this. Testing is left as an exercise to the readers ;-).
---
Documentation/git-log.txt | 2 +- Documentation/user-manual.txt | 2 +- builtin-log.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
Documentation/git-log.txt +1 -1
@@ -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
Documentation/user-manual.txt +1 -1
@@ -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` -------------------------------------------------
builtin-log.c +1 -0
@@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)git_config (git_log_config);init_revisions (&rev, prefix); rev.always_show_header =1 ; + rev.diffopt.recursive =1 ;cmd_log_init (argc, argv, prefix, &rev);return cmd_log_walk (&rev); }
builtin-log.c int cmd_log(int argc, const char **argv, const char *prefix) · line 264
Quoted 10 lines · Junio C Hamano
builtin-log.c +1
-0@@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)git_config (git_log_config);init_revisions (&rev, prefix); rev.always_show_header =1 ; + rev.diffopt.recursive =1 ;cmd_log_init (argc, argv, prefix, &rev);return cmd_log_walk (&rev); }
This should perhaps rather go in cmd_log_init (and be removed from cmd_show and cmd_whatchanged). I think this is semantically a little more clear, and the change will affect other log porcelains (right now just "git-reflog --name-status", but also new ones if they are added).
But yes, this is post-1.5.3, so I will shut up rather than nitpicking your "not meant to be applied now" patches.
-Peff
Quoted 18 lines · Jeff King
builtin-log.c int cmd_log(int argc, const char **argv, const char *prefix) · line 264
Quoted 10 lines · Junio C Hamano
builtin-log.c +1
-0@@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)git_config (git_log_config);init_revisions (&rev, prefix); rev.always_show_header =1 ; + rev.diffopt.recursive =1 ;cmd_log_init (argc, argv, prefix, &rev);return cmd_log_walk (&rev); }This should perhaps rather go in
cmd_log_init(and be removed fromcmd_showandcmd_whatchanged). I think this is semantically a little more clear, and the change will affect other log porcelains (right now just "git-reflog --name-status", but also new ones if they are added).
Quoted 2 lines
But yes, this is post-1.5.3, so I will shut up rather than nitpicking your "not meant to be applied now" patches.
Thanks for your comments; rather than shutting up, could you send an improvement after 1.5.3 happens?
Quoted 5 lines · Junio C Hamano
Quoted 2 lines
But yes, this is post-1.5.3, so I will shut up rather than nitpicking your "not meant to be applied now" patches.
Thanks for your comments; rather than shutting up, could you send an improvement after 1.5.3 happens?
Will do.
-Peff