Merge branch 'maint'
* maint: t7401: squelch garbage output Documentation/git-submodule: typofix Fix config key miscount in url.*.insteadOf Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better
This commit is contained in:
commit
f43e2fd43b
@ -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
|
||||
-----
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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)'::
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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." ;;
|
||||
|
2
remote.c
2
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;
|
||||
|
@ -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 &&
|
||||
|
@ -30,7 +30,7 @@ commit_file () {
|
||||
}
|
||||
|
||||
test_create_repo sm1 &&
|
||||
add_file . foo
|
||||
add_file . foo >/dev/null
|
||||
|
||||
head1=$(add_file sm1 foo1 foo2)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user