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 /builtin-fmt-merge-msg.c | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | commit: abort commit if interactive add failed (diff) | |
| download | tgif-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 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions