summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pkt-line-cleanup'Junio C Hamano2013-04-015-57/+30
|\
| * teach get_remote_heads to read from a memory bufferJeff King2013-02-242-2/+2
| * pkt-line: provide a LARGE_PACKET_MAX static bufferJeff King2013-02-204-20/+15
| * pkt-line: teach packet_read_line to chomp newlinesJeff King2013-02-204-10/+0
| * pkt-line: drop safe_write functionJeff King2013-02-202-2/+2
| * upload-archive: use argv_array to store client argumentsJeff King2013-02-201-21/+14
| * upload-archive: do not copy repo nameJeff King2013-02-201-7/+2
* | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-012-13/+2
|\ \
| * | format-patch: update append_signoff prototypeNguyễn Thái Ngọc Duy2013-02-121-12/+1
| * | sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-121-1/+1
* | | Merge branch 'maint'Junio C Hamano2013-03-311-1/+1
|\ \ \
| * | | cat-file: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-1/+1
* | | | Merge branch 'maint'Junio C Hamano2013-03-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-271-1/+1
| |\ \ \
| | * | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| * | | | Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-261-0/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-261-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-252-6/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
* | | | | | | | | | | | Merge branch 'jk/fast-export-object-lookup'Junio C Hamano2013-03-251-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fast-export: do not load blob objects twiceJeff King2013-03-171-6/+10
| * | | | | | | | | | | | fast-export: rename handle_object functionJeff King2013-03-171-3/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation'Junio C Hamano2013-03-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-131-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: --follow-tagsJunio C Hamano2013-03-051-0/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'Junio C Hamano2013-03-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano2013-03-051-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/describe'Junio C Hamano2013-03-251-21/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-251-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-251-29/+125
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2013-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | drop some obsolete "x = x" compiler warning hacksJeff King2013-03-211-1/+1
* | | | | | | | | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort'Junio C Hamano2013-03-211-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | | | | | | | | | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gpg_interface: allow to request status returnMichael J Gruber2013-02-142-2/+2
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-03-211-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+27
* | | | | | | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help'Junio C Hamano2013-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option'Junio C Hamano2013-03-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-191-1/+3
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/count-garbage'Junio C Hamano2013-03-211-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \