Permalink
Browse files

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
  • Loading branch information...
gitster committed Apr 12, 2008
2 parents eed8183 + e809507 commit d6d96f835cace1c108100cf88e216a59debcb937
Showing with 16 additions and 5 deletions.
  1. +8 −2 Documentation/git-shortlog.txt
  2. +5 −0 Documentation/gitk.txt
  3. +1 −1 builtin-shortlog.c
  4. +2 −2 git-bisect.sh
@@ -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
-----
View
@@ -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)'::
View
@@ -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)
{
View
@@ -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." ;;

0 comments on commit d6d96f8

Please sign in to comment.