diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
| commit | 0877510ad4e8b951b08f9cbb25cfc0d994468979 (patch) | |
| tree | dcfc43b1cf44ba49c3f9f206504d2f1cfee8bcc6 /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'jc/ident' (diff) | |
| parent | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere (diff) | |
| download | tgif-0877510ad4e8b951b08f9cbb25cfc0d994468979.tar.xz | |
Merge branch 'jk/warn-author-committer-after-commit'
* jk/warn-author-committer-after-commit:
user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
commit.c::print_summary: do not release the format string too early
commit: allow suppression of implicit identity advice
commit: show interesting ident information in summary
strbuf: add strbuf_addbuf_percentquote
strbuf_expand: convert "%%" to "%"
Conflicts:
builtin-commit.c
ident.c
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions