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 /Documentation/config.txt | |
| parent | 15a873d6e85d8089117a6a2141c8158bd370cf49 (diff) | |
| parent | 1a893064d7b403625896a2c8bdab39f0f7db61d5 (diff) | |
| download | git-0877510ad4e8b951b08f9cbb25cfc0d994468979.tar.gz | |
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 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 2d6775c135..d4332140a0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -130,6 +130,10 @@ advice.*:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwritting local changes. Default: true. + implicitIdentity:: + Advice on how to set your identity configuration when + your information is guessed from the system username and + domain name. Default: true. -- core.fileMode:: |