From 55ef8a4610c4f1077551682a86f9a4e6d498e8e0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 12 Apr 2008 15:38:20 -0700 Subject: Document -w option to shortlog Noticed by Fredrik Noring. Signed-off-by: Junio C Hamano --- Documentation/git-shortlog.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index c7752575d8..d7cb4c0468 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output SYNOPSIS -------- [verse] -git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] -git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [...] +git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w] +git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[[,[,]]]] [...] DESCRIPTION ----------- @@ -35,6 +35,12 @@ OPTIONS -e, \--email:: Show the email address of each author. +-w[[,[,]]]:: + Linewrap the output by wrapping each line at `width`. The first + line of each entry is indented by `indent1` spaces, and the second + and subsequent lines are indented by `indent2` spaces. `width`, + `indent1`, and `indent2` default to 76, 6 and 9 respectively. + FILES ----- -- cgit v1.3-5-g9baa From e80950786c16e642be76976a8926b2846ba0aa4f Mon Sep 17 00:00:00 2001 From: Clifford Caoile Date: Sat, 12 Apr 2008 18:50:20 +0900 Subject: Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) gitk creates and uses ~/.gitk Signed-off-by: Clifford Caoile Signed-off-by: Junio C Hamano --- Documentation/gitk.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 29edafceda..ed3ba83c53 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -74,6 +74,11 @@ gitk --max-count=100 --all \-- Makefile:: Show at most 100 changes made to the file 'Makefile'. Instead of only looking for changes in the current branch look in all branches. +Files +----- +Gitk creates the .gitk file in your $HOME directory to store preferences +such as display options, font, and colors. + See Also -------- 'qgit(1)':: -- cgit v1.3-5-g9baa From 51836e9e125f67aa26724154757b4734c08057e4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 12 Apr 2008 18:34:39 -0700 Subject: Documentation/git-submodule: typofix Signed-off-by: Junio C Hamano --- Documentation/git-submodule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 41f9f63566..6ffd896fbc 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -70,7 +70,7 @@ OPTIONS -n, --summary-limit:: This option is only valid for the summary command. Limit the summary size (number of commits shown in total). - Giving 0 will disable the summary; a negative number means unlimted + Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules. -- cgit v1.3-5-g9baa