diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:04:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:04:38 -0700 |
| commit | acb0b7b01f64cf55d508b469eb2a351359c0cd82 (patch) | |
| tree | 90796d24196273c1c88e498a1a5797b3690a66d4 /git-repack.sh | |
| parent | f054a419419337142ffe40433aa3984ccc000624 (diff) | |
| parent | 4f6a32f8af9cceaf0c8ccf6d00d2f100dab5a6db (diff) | |
| download | git-acb0b7b01f64cf55d508b469eb2a351359c0cd82.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
Conflicts:
builtin-commit.c
Diffstat (limited to 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-repack.sh b/git-repack.sh index be6db5e805..00c597e97c 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -181,5 +181,5 @@ fi case "$no_update_info" in t) : ;; -*) git-update-server-info ;; +*) git update-server-info ;; esac |