summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | trailer: streamline trailer item create and addJonathan Tan2016-10-201-70/+60
| * | | | | | | | | | | trailer: use list.h for doubly-linked listJonathan Tan2016-10-201-167/+91
| * | | | | | | | | | | trailer: improve const correctnessJonathan Tan2016-10-141-7/+7
* | | | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-3119-135/+1498
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | contrib/long-running-filter: add long running filter exampleLars Schneider2016-10-172-1/+131
| * | | | | | | | | | | convert: add filter.<driver>.process optionLars Schneider2016-10-174-10/+1082
| * | | | | | | | | | | convert: prepare filter.<driver>.process optionLars Schneider2016-10-171-26/+34
| * | | | | | | | | | | convert: make apply_filter() adhere to standard Git error handlingLars Schneider2016-10-171-9/+6
| * | | | | | | | | | | pkt-line: add functions to read/write flush terminated packet streamsLars Schneider2016-10-172-0/+80
| * | | | | | | | | | | pkt-line: add packet_write_gently()Lars Schneider2016-10-171-0/+17
| * | | | | | | | | | | pkt-line: add packet_flush_gently()Lars Schneider2016-10-172-0/+9
| * | | | | | | | | | | pkt-line: add packet_write_fmt_gently()Lars Schneider2016-10-172-4/+31
| * | | | | | | | | | | pkt-line: extract set_packet_header()Lars Schneider2016-10-171-6/+13
| * | | | | | | | | | | pkt-line: rename packet_write() to packet_write_fmt()Lars Schneider2016-10-1711-29/+29
| * | | | | | | | | | | run-command: add clean_on_exit_handlerLars Schneider2016-10-172-4/+20
| * | | | | | | | | | | run-command: move check_pipe() from write_or_die to run_commandLars Schneider2016-10-173-16/+16
| * | | | | | | | | | | convert: modernize testsLars Schneider2016-10-171-29/+29
| * | | | | | | | | | | convert: quote filter names in error messagesLars Schneider2016-10-171-6/+6
* | | | | | | | | | | | Merge branch 'ls/git-open-cloexec'Junio C Hamano2016-10-315-14/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | read-cache: make sure file handles are not inherited by child processesls/git-open-cloexecLars Schneider2016-10-251-1/+8
| * | | | | | | | | | | | sha1_file: open window into packfiles with O_CLOEXECLars Schneider2016-10-251-4/+9
| * | | | | | | | | | | | sha1_file: rename git_open_noatime() to git_open()Lars Schneider2016-10-254-9/+9
* | | | | | | | | | | | | Sync with 2.10.2Junio C Hamano2016-10-282-1/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Git 2.10.2v2.10.2Junio C Hamano2016-10-283-2/+69
| * | | | | | | | | | | | Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano2016-10-281-170/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano2016-10-287-20/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-2815-45/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-unique-abbrev-comments' into maintJunio C Hamano2016-10-281-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano2016-10-281-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2016-10-282-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-283-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2016-10-282-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-10-281-11/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-284-4/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-282-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-282-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano2016-10-281-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2016-10-282-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/commit-p-doc' into maintJunio C Hamano2016-10-281-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/http-empty-auth' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/autoconf-curl-ssl' into maintJunio C Hamano2016-10-281-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/curl-imap-send-explicit-scheme' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maintJunio C Hamano2016-10-281-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-10-281-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano2016-10-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano2016-10-281-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting ready for 2.11-rc0Junio C Hamano2016-10-271-1/+36