diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:17:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:17:51 -0700 |
| commit | f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch) | |
| tree | b29df95a9ea15dc54263921f63077c62058d6c22 /t/t7401-submodule-summary.sh | |
| parent | git_config_bool_or_int() (diff) | |
| parent | t7401: squelch garbage output (diff) | |
| download | tgif-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.xz | |
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
Diffstat (limited to 't/t7401-submodule-summary.sh')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 0f3c42ab35..b9a22190e8 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) |