summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* split-index: s/eith/with/ typo fixcc/split-index-typofixChristian Couder2016-11-011-1/+1
* Git 2.11-rc0v2.11.0-rc0Junio C Hamano2016-10-312-28/+42
* Merge branch 'nd/test-helpers'Junio C Hamano2016-10-312-3/+18
|\
| * valgrind: support test helpersnd/test-helpersRené Scharfe2016-10-272-3/+18
* | Merge branch 'sc/fmt-merge-msg-doc-markup-fix'Junio C Hamano2016-10-311-2/+2
|\ \
| * | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fixStefan Christ2016-10-281-2/+2
* | | Merge branch 'ak/sh-setup-dot-source-i18n-fix'Junio C Hamano2016-10-311-3/+3
|\ \ \
| * | | git-sh-setup: be explicit where to dot-source git-sh-i18n from.ak/sh-setup-dot-source-i18n-fixAnders Kaseorg2016-10-301-3/+3
* | | | Merge branch 'rs/commit-pptr-simplify'Junio C Hamano2016-10-311-8/+6
|\ \ \ \
| * | | | commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-8/+6
| | |/ / | |/| |
* | | | Merge branch 'jk/rebase-config-insn-fmt-docfix'Junio C Hamano2016-10-311-1/+1
|\ \ \ \
| * | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfixJeff King2016-10-301-1/+1
| |/ / /
* | | | Merge branch 'ak/pre-receive-hook-template-modefix'Junio C Hamano2016-10-311-0/+0
|\ \ \ \
| * | | | pre-receive.sample: mark it executableak/pre-receive-hook-template-modefixAnders Kaseorg2016-10-281-0/+0
* | | | | Merge branch 'jk/common-main'Junio C Hamano2016-10-311-2/+2
|\ \ \ \ \
| * | | | | git-compat-util: move content inside ifdef/endif guardsJeff King2016-10-271-2/+2
* | | | | | Merge branch 'aw/numbered-stash'Junio C Hamano2016-10-313-3/+50
|\ \ \ \ \ \
| * | | | | | stash: allow stashes to be referenced by index onlyaw/numbered-stashAaron M Watson2016-10-263-3/+50
* | | | | | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-10-313-279/+654
|\ \ \ \ \ \ \
| * | | | | | | trailer: support values folded to multiple linesJonathan Tan2016-10-213-10/+211
| * | | | | | | trailer: forbid leading whitespace in trailersJonathan Tan2016-10-213-2/+17
| * | | | | | | trailer: allow non-trailers in trailer blockJonathan Tan2016-10-213-15/+194
| * | | | | | | trailer: clarify failure modes in parse_trailerJonathan Tan2016-10-211-22/+53
| * | | | | | | trailer: make args have their own structJonathan Tan2016-10-201-50/+85
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \