pack-objects: new option --honor-pack-keep

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 01bd2d6b77da49b759e1887cf98b8c5b3bf98c38..79be4f1c0086fd1193734412019feeef8b07d669 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -92,7 +92,8 @@ OPTIONS
 
 -s::
 --signoff::
-       Add Signed-off-by line at the end of the commit message.
+       Add Signed-off-by line by the commiter at the end of the commit
+       log message.
 
 -n::
 --no-verify::
@@ -331,7 +332,7 @@ linkgit:git-commit-tree[1]
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 
 GIT