summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-shortlog.txt10
-rw-r--r--Documentation/git-submodule.txt2
-rw-r--r--Documentation/gitk.txt5
-rw-r--r--builtin-shortlog.c2
-rwxr-xr-xgit-bisect.sh4
-rw-r--r--remote.c2
-rwxr-xr-xt/t5516-fetch-push.sh8
-rwxr-xr-xt/t7401-submodule-summary.sh2
8 files changed, 23 insertions, 12 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c775257..d7cb4c0 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/git-submodule.txt b/Documentation/git-submodule.txt
index 41f9f63..6ffd896 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.
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 29edafc..ed3ba83 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 bd795b1..e6a2865 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 ff904e6..408775a 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -159,9 +159,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." ;;
diff --git a/remote.c b/remote.c
index 08af7f9..369dc33 100644
--- a/remote.c
+++ b/remote.c
@@ -315,7 +315,7 @@ static int handle_config(const char *key, const char *value)
}
if (!prefixcmp(key, "url.")) {
struct rewrite *rewrite;
- name = key + 5;
+ name = key + 4;
subkey = strrchr(name, '.');
if (!subkey)
return 0;
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 793ffc6..6d7e738 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -103,9 +103,9 @@ test_expect_success 'fetch with wildcard' '
test_expect_success 'fetch with insteadOf' '
mk_empty &&
(
- TRASH=$(pwd) &&
+ TRASH=$(pwd)/ &&
cd testrepo &&
- git config url./$TRASH/.insteadOf trash/
+ git config url.$TRASH.insteadOf trash/
git config remote.up.url trash/. &&
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
@@ -145,8 +145,8 @@ test_expect_success 'push with wildcard' '
test_expect_success 'push with insteadOf' '
mk_empty &&
- TRASH=$(pwd) &&
- git config url./$TRASH/.insteadOf trash/ &&
+ TRASH=$(pwd)/ &&
+ git config url.$TRASH.insteadOf trash/ &&
git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
(
cd testrepo &&
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 0f3c42a..b9a2219 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -30,7 +30,7 @@ commit_file () {
}
test_create_repo sm1 &&
-add_file . foo
+add_file . foo >/dev/null
head1=$(add_file sm1 foo1 foo2)