git/builtin-commit.c, branch v1.7.0.5

Merge branch 'jc/maint-status-preload' into maint

2010-03-05T06:25:45Z

* jc/maint-status-preload: status: preload index to optimize lstat(2) calls

commit: quote the user name in the example

2010-02-24T23:34:00Z

If the user runs git config --global user.name Your Name as suggested, user.name will be set to "Your". With this patch, the suggested command will be git config --global user.name "Your Name" which will set user.name to "Your Name" and hopefully help users avoid the former mistake. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano

status: preload index to optimize lstat(2) calls

2010-02-17T20:30:41Z

Noticed by James Pickens Signed-off-by: Junio C Hamano

Merge branch 'nd/status-partial-refresh'

2010-01-21T04:28:50Z

* nd/status-partial-refresh: rm: only refresh entries that we may touch status: only touch path we may need to check

Merge branch 'mm/conflict-advice'

2010-01-20T22:42:59Z

* mm/conflict-advice: Be more user-friendly when refusing to do something because of conflict. Conflicts: Documentation/config.txt advice.c advice.h

Merge branch 'jk/warn-author-committer-after-commit'

2010-01-20T22:40:12Z

* 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

Merge branch 'jc/ident'

2010-01-20T22:39:52Z

* jc/ident: ident.c: replace fprintf with fputs to suppress compiler warning user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere ident.c: treat $EMAIL as giving user.email identity explicitly ident.c: check explicit identity for name and email separately ident.c: remove unused variables

Merge branch 'jc/rerere'

2010-01-19T02:13:01Z

* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends

Merge branch 'jh/commit-status'

2010-01-18T00:00:07Z

* jh/commit-status: t7502: test commit.status, --status and --no-status commit: support commit.status, --status, and --no-status Conflicts: Documentation/git-commit.txt builtin-commit.c

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

2010-01-17T21:59:36Z

Signed-off-by: Junio C Hamano