summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Spelling fixesvs/typofixVille Skyttä2016-08-1125-33/+33
* Sync with maintJunio C Hamano2016-08-081-0/+34
|\
| * Hopefully final batch for 2.9.3Junio C Hamano2016-08-081-0/+34
| * Merge branch 'sb/pack-protocol-doc-nak' into maintJunio C Hamano2016-08-081-1/+1
| |\
| * \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-083-17/+28
| |\ \
| * \ \ Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-08-081-2/+0
| |\ \ \
| * \ \ \ Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintJunio C Hamano2016-08-081-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/doc-diff-filter-exclude' into maintJunio C Hamano2016-08-081-0/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-082-11/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano2016-08-085-8/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'lf/recv-sideband-cleanup' into maintJunio C Hamano2016-08-081-74/+58
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-084-16/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'lf/sideband-returns-void' into maintJunio C Hamano2016-08-083-15/+10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano2016-08-083-29/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/find-perl-on-freebsd-in-local' into maintJunio C Hamano2016-08-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-08-082-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-089-29/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/notes-merge-no-toctou' into maintJunio C Hamano2016-08-081-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-083-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-082-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0815-53/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-082-18/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.10Junio C Hamano2016-08-081-20/+65
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hashmap-doc-init'Junio C Hamano2016-08-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | hashmap: clarify that hashmap_entry can safely be discardedjc/hashmap-doc-initJunio C Hamano2016-08-021-0/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/build-time-pager-tweaks'Junio C Hamano2016-08-085-8/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pager: move pager-specific setup into the buildew/build-time-pager-tweaksEric Wong2016-08-045-8/+67
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-08-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | gitmodules: document shallow recommendationsb/submodule-recommend-shallownessStefan Beller2016-08-031-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/parseopt-string-list'Junio C Hamano2016-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | blame: drop strdup of string literaljk/parseopt-string-listEric Sunshine2016-08-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano2016-08-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | clarify %f documentationjh/clean-smudge-f-docJoey Hess2016-08-031-0/+5
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/nedmalloc-gcc6-warnings'Junio C Hamano2016-08-081-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: work around overzealous GCC 6 warningjs/nedmalloc-gcc6-warningsRené Scharfe2016-08-051-5/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: fix misleading indentationJohannes Schindelin2016-08-041-4/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fbsd-lazy-mtime'Junio C Hamano2016-08-081-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtimeNguyễn Thái Ngọc Duy2016-08-041-1/+16
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-decorate-color-head-arrow'Junio C Hamano2016-08-082-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | log: decorate HEAD -> branch with the same color for arrow and HEADnd/log-decorate-color-head-arrowNguyễn Thái Ngọc Duy2016-07-122-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-087-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-053-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-014-6/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/st-mult'Junio C Hamano2016-08-083-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | pass constants as first argument to st_mult()rs/st-multRené Scharfe2016-08-013-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ib/t3700-add-chmod-x-updates'Junio C Hamano2016-08-081-39/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: add a test_mode_in_index helper functionib/t3700-add-chmod-x-updatesIngo Brückl2016-08-011-32/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: merge two tests into oneIngo Brückl2016-08-011-12/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: remove unwanted leftover files before running new testsIngo Brückl2016-08-011-0/+3