author | Junio C Hamano <gitster@pobox.com> | |
Sat, 12 Apr 2008 22:41:19 +0000 (15:41 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 12 Apr 2008 22:41:19 +0000 (15:41 -0700) |
* maint-1.5.4:
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
Documentation/git-shortlog.txt | patch | blob | history | |
Documentation/gitk.txt | patch | blob | history | |
builtin-shortlog.c | patch | blob | history | |
git-bisect.sh | patch | blob | history |
index c7752575d8f5f35657cb9ef5a7e9e18b82ddc8b8..d7cb4c0468e713543042d41ff57a638a7fda2881 100644 (file)
SYNOPSIS
--------
[verse]
-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
-git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>...]
+git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w]
+git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
DESCRIPTION
-----------
-e, \--email::
Show the email address of each author.
+-w[<width>[,<indent1>[,<indent2>]]]::
+ 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
-----
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 29edafcedac6bcb95315e7429ea56d2d283ef6f6..ed3ba83c530411801dd1cd8980cad4d005962690 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
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)'::
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index bd795b1db7a4054a0218d1ec96794ad25d656896..e6a2865019cceadfcbfc8575a2bd1f97b7159dcb 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
#include "shortlog.h"
static const char shortlog_usage[] =
-"git-shortlog [-n] [-s] [-e] [<commit-id>... ]";
+"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";
static int compare_by_number(const void *a1, const void *a2)
{
diff --git a/git-bisect.sh b/git-bisect.sh
index 6644b10e362103faafc232a88ca96c80aabd88d8..5177a2a11482af276ae5243c4d550b68bb0e2a28 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
shift
for rev in "$@"
do
- rev=$(git rev-parse --verify "$rev^{commit}") ||
+ sha=$(git rev-parse --verify "$rev^{commit}") ||
die "Bad rev input: $rev"
- bisect_write "$state" "$rev"
+ bisect_write "$state" "$sha"
done ;;
*,bad)
die "'git bisect bad' can take only one argument." ;;