git/builtin-commit.c, branch gitk-resize-error

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22T22:29:41Z

This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds 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

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

2010-01-17T21:54:28Z

Signed-off-by: Junio C Hamano

commit.c::print_summary: do not release the format string too early

2010-01-17T08:57:51Z

When we are showing a clean merge, log_tree_commit() won't show the header and we would need the format string to format the commit summary ourselves. Signed-off-by: Junio C Hamano