Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/t2300-setup' | Junio C Hamano | 2016-07-06 | 1 | -1/+9 |
|\ | |||||
| * | t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setup | Johannes Schindelin | 2016-06-22 | 1 | -1/+9 |
* | | Merge branch 'cb/t7810-test-label-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | t7810: fix duplicated test titlecb/t7810-test-label-fix | Charles Bailey | 2016-06-21 | 1 | -1/+1 |
* | | | Merge branch 'sb/t5614-modernize' | Junio C Hamano | 2016-07-06 | 1 | -50/+20 |
|\ \ \ | |||||
| * | | | t5614: don't use subshellssb/t5614-modernize | Stefan Beller | 2016-06-21 | 1 | -50/+20 |
* | | | | Merge branch 'js/perf-on-apple' | Junio C Hamano | 2016-07-06 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | perf: accommodate for MacOSXjs/perf-on-apple | Johannes Schindelin | 2016-06-21 | 1 | -1/+5 |
* | | | | | Merge branch 'ak/t7800-wo-readlink' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t7800: readlink may not be availableak/t7800-wo-readlink | Armin Kunaschik | 2016-06-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/tzoffset-fix' | Junio C Hamano | 2016-07-06 | 2 | -17/+69 |
|\ \ \ \ \ \ | |||||
| * | | | | | | local_tzoffset: detect errors from tm_to_time_t | Jeff King | 2016-06-20 | 1 | -0/+5 |
| * | | | | | | t0006: test various date formats | Jeff King | 2016-06-20 | 1 | -0/+21 |
| * | | | | | | t0006: rename test-date's "show" to "relative" | Jeff King | 2016-06-20 | 1 | -13/+13 |
* | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-07-06 | 1 | -2/+17 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthru | Junio C Hamano | 2016-06-20 | 1 | -2/+17 |
* | | | | | | | Merge branch 'jk/gpg-interface-cleanup' | Junio C Hamano | 2016-07-06 | 1 | -1/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gpg-interface: check gpg signature creation statusjk/gpg-interface-cleanup | Michael J Gruber | 2016-06-17 | 1 | -1/+8 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/graph-width-padded' | Junio C Hamano | 2016-07-06 | 1 | -0/+57 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pretty.c: support <direction>|(<negative number>) formsnd/graph-width-padded | Nguyễn Thái Ngọc Duy | 2016-06-16 | 1 | -0/+33 |
| * | | | | | | | pretty: pass graph width to pretty formatting for use in '%>|(N)' | Josef Kufner | 2016-06-16 | 1 | -0/+24 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/repack-keep-unreachable' | Junio C Hamano | 2016-07-06 | 1 | -0/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | repack: extend --keep-unreachable to loose objectsjk/repack-keep-unreachable | Jeff King | 2016-06-14 | 1 | -0/+13 |
| * | | | | | | | repack: add --keep-unreachable option | Jeff King | 2016-06-14 | 1 | -0/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ew/mboxrd-format-am' | Junio C Hamano | 2016-07-06 | 6 | -0/+120 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am: support --patch-format=mboxrdew/mboxrd-format-am | Eric Wong | 2016-06-06 | 1 | -0/+20 |
| * | | | | | | | mailsplit: support unescaping mboxrd messages | Eric Wong | 2016-06-06 | 4 | -0/+59 |
| * | | | | | | | pretty: support "mboxrd" output format | Eric Wong | 2016-06-06 | 1 | -0/+41 |
* | | | | | | | | Merge branch 'jk/upload-pack-hook' | Junio C Hamano | 2016-07-06 | 3 | -0/+125 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-pack: provide a hook for running pack-objects | Jeff King | 2016-06-02 | 1 | -0/+62 |
| * | | | | | | | | t1308: do not get fooled by symbolic links to the source tree | Junio C Hamano | 2016-06-02 | 1 | -1/+1 |
| * | | | | | | | | config: add a notion of "scope" | Jeff King | 2016-05-27 | 2 | -0/+19 |
| * | | | | | | | | config: return configset value for current_config_ functions | Jeff King | 2016-05-27 | 2 | -0/+44 |
* | | | | | | | | | Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose' | Junio C Hamano | 2016-07-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | lib-httpd.sh: print error.log on errornd/test-lib-httpd-show-error-log-in-verbose | Nguyễn Thái Ngọc Duy | 2016-06-13 | 1 | -0/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/string-list-static-init' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | use string_list initializer consistentlyjk/string-list-static-init | Jeff King | 2016-06-13 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'et/add-chmod-x' | Junio C Hamano | 2016-06-27 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add: add --chmod=+x / --chmod=-x options | Edward Thomson | 2016-06-07 | 1 | -0/+30 |
* | | | | | | | | | | | Merge branch 'sg/reflog-past-root' | Junio C Hamano | 2016-06-27 | 2 | -1/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | reflog: continue walking the reflog past root commits | SZEDER Gábor | 2016-06-06 | 2 | -1/+23 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rs/xdiff-hunk-with-func-line' | Junio C Hamano | 2016-06-20 | 7 | -77/+278 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-line | René Scharfe | 2016-06-09 | 1 | -1/+23 |
| * | | | | | | | | | | | grep: -W: don't extend context to trailing empty lines | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | | | | | | | | | | | t7810: add test for grep -W and trailing empty context lines | René Scharfe | 2016-05-31 | 1 | -3/+16 |
| * | | | | | | | | | | | xdiff: don't trim common tail with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | | | | | | | | | | | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 2016-05-31 | 1 | -2/+2 |
| * | | | | | | | | | | | xdiff: ignore empty lines before added functions with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | | | | | | | | | | | xdiff: handle appended chunks better with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | | | | | | | | | | | t4051: rewrite, add more tests | René Scharfe | 2016-05-31 | 6 | -74/+240 |