![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 5 Apr 2009 08:04:38 +0000 (01:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 5 Apr 2009 08:04:38 +0000 (01:04 -0700) | ||
| commit | acb0b7b01f64cf55d508b469eb2a351359c0cd82 | |
| tree | 90796d24196273c1c88e498a1a5797b3690a66d4 | tree | snapshot |
| parent | f054a419419337142ffe40433aa3984ccc000624 | commit | diff |
| parent | 4f6a32f8af9cceaf0c8ccf6d00d2f100dab5a6db | commit | diff |
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
* maint-1.6.0:
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
Conflicts:
builtin-commit.c
| builtin-commit.c | diff1 | | diff2 | | blob | history |