summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-codeDavid Aguilar2016-11-291-0/+4
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-2920-38/+71
* 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
|\
| * t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expectPranit Bauva2016-10-171-170/+13
* | Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano2016-10-287-20/+17
|\ \
| * | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-nullJunio C Hamano2016-10-127-20/+17
* | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-2815-45/+99
|\ \ \
| * | | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-104-20/+15
| * | | remove unnecessary NULL check before free(3)René Scharfe2016-10-102-2/+6
| * | | coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe2016-10-031-3/+26
| * | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-274-4/+9
| * | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-273-2/+8
| * | | gitignore: ignore output files of coccicheck make targetRené Scharfe2016-09-271-0/+1
| * | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-157-12/+18
| * | | add coccicheck make targetRené Scharfe2016-09-151-0/+14
| * | | contrib/coccinelle: fix semantic patch for oid_to_hex_r()René Scharfe2016-09-151-6/+6
* | | | Merge branch 'jc/diff-unique-abbrev-comments' into maintJunio C Hamano2016-10-281-1/+22
|\ \ \ \
| * | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-commentsJunio C Hamano2016-09-301-1/+22
* | | | | Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano2016-10-281-1/+2
|\ \ \ \ \
| * | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fixRené Scharfe2016-10-111-1/+2
* | | | | | Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
|\ \ \ \ \ \
| * | | | | | reset: fix usagejs/reset-usageJohannes Schindelin2016-10-111-1/+1
| |/ / / / /
* | | | | | Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2016-10-282-21/+21
|\ \ \ \ \ \
| * | | | | | doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustrationPhilip Oakley2016-10-241-8/+8
| * | | | | | doc: fix merge-base ASCII art tab spacingPhilip Oakley2016-10-211-13/+13
| |/ / / / /
* | | | | | Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-283-5/+37
|\ \ \ \ \ \
| * | | | | | test-lib: bail out when "-v" used under "prove"jk/tap-verbose-fixJeff King2016-10-241-0/+10
| * | | | | | travis: use --verbose-log test optionJeff King2016-10-211-1/+1
| * | | | | | test-lib: add --verbose-log optionJeff King2016-10-212-3/+25
| * | | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King2016-10-211-2/+2
| |/ / / / /
* | | | | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-281-0/+1
|\ \ \ \ \ \
| * | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fixJunio C Hamano2016-10-201-0/+1
* | | | | | | Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2016-10-282-3/+8
|\ \ \ \ \ \ \
| * | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-docBrandon Williams2016-10-192-3/+8
* | | | | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-10-281-11/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | inline xalloc_flex() into FLEXPTR_ALLOC_MEMjk/tighten-allocRené Scharfe2016-10-171-9/+3
| * | | | | | | | avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEMRené Scharfe2016-10-171-2/+3
* | | | | | | | | Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-284-4/+112
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-144-4/+112
* | | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-282-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-122-0/+9
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-282-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-okDennis Kaarsemaker2016-10-142-0/+10
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano2016-10-281-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2016-10-282-1/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | files_read_raw_ref: prevent infinite retry loops in generaljk/ref-symlink-loopJeff King2016-10-101-0/+7
| * | | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-102-1/+11
* | | | | | | | | | | Merge branch 'nd/commit-p-doc' into maintJunio C Hamano2016-10-281-2/+4
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status