diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-12 15:41:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 15:41:19 -0700 |
| commit | d6d96f835cace1c108100cf88e216a59debcb937 (patch) | |
| tree | f5d347de6193849ad4cec2b52d35e225d9c1e9e9 | |
| parent | eed81838f0d0e031702473e1d427d71055134edd (diff) | |
| parent | e80950786c16e642be76976a8926b2846ba0aa4f (diff) | |
| download | git-d6d96f835cace1c108100cf88e216a59debcb937.tar.gz git-d6d96f835cace1c108100cf88e216a59debcb937.tar.xz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
| -rw-r--r-- | Documentation/git-shortlog.txt | 10 | ||||
| -rw-r--r-- | Documentation/gitk.txt | 5 | ||||
| -rw-r--r-- | builtin-shortlog.c | 2 | ||||
| -rwxr-xr-x | git-bisect.sh | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index c7752575d..d7cb4c046 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] [<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 ----------- @@ -35,6 +35,12 @@ OPTIONS -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 29edafced..ed3ba83c5 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)':: diff --git a/builtin-shortlog.c b/builtin-shortlog.c index bd795b1db..e6a286501 100644 --- a/builtin-shortlog.c +++ b/builtin-shortlog.c @@ -9,7 +9,7 @@ #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 6644b10e3..5177a2a11 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -155,9 +155,9 @@ bisect_state() { 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." ;; |