Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 25 | -33/+33 |
* | Sync with maint | Junio C Hamano | 2016-08-08 | 1 | -0/+34 |
|\ | |||||
| * | Hopefully final batch for 2.9.3 | Junio C Hamano | 2016-08-08 | 1 | -0/+34 |
| * | Merge branch 'sb/pack-protocol-doc-nak' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 | 3 | -17/+28 |
| |\ \ | |||||
| * \ \ | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-08-08 | 1 | -2/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/worktree-use-strbuf-absolute-path' into maint | Junio C Hamano | 2016-08-08 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/doc-diff-filter-exclude' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 | 2 | -11/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/use-strbuf-addbuf' into maint | Junio C Hamano | 2016-08-08 | 5 | -8/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'lf/recv-sideband-cleanup' into maint | Junio C Hamano | 2016-08-08 | 1 | -74/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 | 4 | -16/+16 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'lf/sideband-returns-void' into maint | Junio C Hamano | 2016-08-08 | 3 | -15/+10 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/send-pack-stdio' into maint | Junio C Hamano | 2016-08-08 | 3 | -29/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/commit-editmsg-path' into maint | Junio C Hamano | 2016-08-08 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/find-perl-on-freebsd-in-local' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/daemon-socket-keepalive' into maint | Junio C Hamano | 2016-08-08 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 9 | -29/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/notes-merge-no-toctou' into maint | Junio C Hamano | 2016-08-08 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 | 3 | -3/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 | 2 | -2/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 | 15 | -53/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 | 2 | -18/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.10 | Junio C Hamano | 2016-08-08 | 1 | -20/+65 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hashmap-doc-init' | Junio C Hamano | 2016-08-08 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | hashmap: clarify that hashmap_entry can safely be discardedjc/hashmap-doc-init | Junio C Hamano | 2016-08-02 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/build-time-pager-tweaks' | Junio C Hamano | 2016-08-08 | 5 | -8/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | pager: move pager-specific setup into the buildew/build-time-pager-tweaks | Eric Wong | 2016-08-04 | 5 | -8/+67 |
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recommend-shallowness' | Junio C Hamano | 2016-08-08 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | gitmodules: document shallow recommendationsb/submodule-recommend-shallowness | Stefan Beller | 2016-08-03 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/parseopt-string-list' | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | blame: drop strdup of string literaljk/parseopt-string-list | Eric Sunshine | 2016-08-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc' | Junio C Hamano | 2016-08-08 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | clarify %f documentationjh/clean-smudge-f-doc | Joey Hess | 2016-08-03 | 1 | -0/+5 |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/nedmalloc-gcc6-warnings' | Junio C Hamano | 2016-08-08 | 1 | -9/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: work around overzealous GCC 6 warningjs/nedmalloc-gcc6-warnings | René Scharfe | 2016-08-05 | 1 | -5/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: fix misleading indentation | Johannes Schindelin | 2016-08-04 | 1 | -4/+4 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fbsd-lazy-mtime' | Junio C Hamano | 2016-08-08 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtime | Nguyễn Thái Ngọc Duy | 2016-08-04 | 1 | -1/+16 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-decorate-color-head-arrow' | Junio C Hamano | 2016-08-08 | 2 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | log: decorate HEAD -> branch with the same color for arrow and HEADnd/log-decorate-color-head-arrow | Nguyễn Thái Ngọc Duy | 2016-07-12 | 2 | -3/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr' | Junio C Hamano | 2016-08-08 | 7 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstr | René Scharfe | 2016-08-05 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 | 4 | -6/+6 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/st-mult' | Junio C Hamano | 2016-08-08 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pass constants as first argument to st_mult()rs/st-mult | René Scharfe | 2016-08-01 | 3 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ib/t3700-add-chmod-x-updates' | Junio C Hamano | 2016-08-08 | 1 | -39/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: add a test_mode_in_index helper functionib/t3700-add-chmod-x-updates | Ingo Brückl | 2016-08-01 | 1 | -32/+22 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: merge two tests into one | Ingo Brückl | 2016-08-01 | 1 | -12/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: remove unwanted leftover files before running new tests | Ingo Brückl | 2016-08-01 | 1 | -0/+3 |