Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 2017-02-02 | 6 | -5/+97 |
|\ | |||||
| * | document behavior of empty color name | Jeff King | 2017-02-02 | 1 | -0/+3 |
| * | color_parse_mem: allow empty color spec | Jeff King | 2017-02-01 | 4 | -4/+25 |
| * | log --graph: customize the graph lines with config log.graphColors | Nguyễn Thái Ngọc Duy | 2017-01-24 | 3 | -3/+63 |
| * | color.c: trim leading spaces in color_parse_mem() | Nguyễn Thái Ngọc Duy | 2017-01-19 | 1 | -1/+6 |
| * | color.c: fix color_parse_mem() with value_len == 0 | Nguyễn Thái Ngọc Duy | 2017-01-19 | 1 | -0/+3 |
* | | Merge branch 'ep/commit-static-buf-cleanup' | Junio C Hamano | 2017-02-02 | 1 | -17/+14 |
|\ \ | |||||
| * | | builtin/commit.c: switch to strbuf, instead of snprintf() | Elia Pinto | 2017-01-31 | 1 | -6/+4 |
| * | | builtin/commit.c: remove the PATH_MAX limitation via dynamic allocation | Elia Pinto | 2017-01-13 | 1 | -11/+10 |
* | | | Merge branch 'bc/use-asciidoctor-opt' | Junio C Hamano | 2017-02-02 | 5 | -13/+88 |
|\ \ \ | |||||
| * | | | Documentation: implement linkgit macro for Asciidoctor | brian m. carlson | 2017-01-31 | 2 | -3/+29 |
| * | | | Makefile: add a knob to enable the use of Asciidoctor | brian m. carlson | 2017-01-23 | 2 | -0/+18 |
| * | | | Documentation: move dblatex arguments into variable | brian m. carlson | 2017-01-23 | 1 | -1/+2 |
| * | | | Documentation: add XSLT to fix DocBook for Texinfo | brian m. carlson | 2017-01-23 | 2 | -3/+30 |
| * | | | Documentation: sort sources for gitman.texi | brian m. carlson | 2017-01-23 | 1 | -1/+1 |
| * | | | Documentation: remove unneeded argument in cat-texi.perl | brian m. carlson | 2017-01-23 | 1 | -2/+2 |
| * | | | Documentation: modernize cat-texi.perl | brian m. carlson | 2017-01-23 | 1 | -6/+9 |
| * | | | Documentation: fix warning in cat-texi.perl | brian m. carlson | 2017-01-23 | 1 | -1/+1 |
* | | | | Merge branch 'sg/mailmap-self' | Junio C Hamano | 2017-02-02 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | .mailmap: update Gábor Szeder's email address | SZEDER Gábor | 2017-02-01 | 1 | -0/+1 |
* | | | | | Merge branch 'js/mingw-hooks-with-exe-suffix' | Junio C Hamano | 2017-02-02 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | mingw: allow hooks to be .exe files | Johannes Schindelin | 2017-01-30 | 1 | -1/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs/receive-pack-cleanup' | Junio C Hamano | 2017-02-02 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | receive-pack: call string_list_clear() unconditionally | René Scharfe | 2017-01-31 | 1 | -2/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'mm/reset-facl-before-umask-test' | Junio C Hamano | 2017-02-02 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | t0001: don't let a default ACL interfere with the umask test | Matt McCutchen | 2017-01-30 | 1 | -0/+3 |
* | | | | | | Merge branch 'hv/mingw-help-is-executable' | Junio C Hamano | 2017-02-02 | 1 | -3/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | help: improve is_executable() on Windows | Heiko Voigt | 2017-01-30 | 1 | -3/+18 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'gv/mingw-p4-mapuser' | Junio C Hamano | 2017-02-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: fix git-p4.mapUser on Windows | George Vanburgh | 2017-01-30 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/absolute-pathdup' | Junio C Hamano | 2017-02-02 | 6 | -4/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use absolute_pathdup() | René Scharfe | 2017-01-27 | 3 | -4/+4 |
| * | | | | | | abspath: add absolute_pathdup() | René Scharfe | 2017-01-26 | 3 | -0/+14 |
* | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround' | Junio C Hamano | 2017-02-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/ | Johannes Schindelin | 2017-01-27 | 1 | -1/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'cw/doc-sign-off' | Junio C Hamano | 2017-02-02 | 1 | -7/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: clarify distinction between sign-off and pgp-signing | Cornelius Weig | 2017-01-27 | 1 | -7/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'js/status-pre-rebase-i' | Junio C Hamano | 2017-02-02 | 2 | -4/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | status: be prepared for not-yet-started interactive rebase | Johannes Schindelin | 2017-01-26 | 2 | -4/+29 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/retire-relink' | Junio C Hamano | 2017-02-02 | 5 | -206/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | relink: really remove the command | Junio C Hamano | 2017-01-25 | 2 | -203/+0 |
| * | | | | | | | relink: retire the command | Johannes Schindelin | 2017-01-25 | 5 | -3/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sb/submodule-add-force' | Junio C Hamano | 2017-02-02 | 2 | -2/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule add: extend force flag to add existing repos | Stefan Beller | 2016-11-29 | 2 | -2/+22 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2017-01-31 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Ready for 2.11.1 | Junio C Hamano | 2017-01-31 | 1 | -0/+45 |
| * | | | | | | | Merge branch 'sb/in-core-index-doc' into maint | Junio C Hamano | 2017-01-31 | 3 | -22/+32 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/mingw-isatty' into maint | Junio C Hamano | 2017-01-31 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/coding-guidelines-update' into maint | Junio C Hamano | 2017-01-31 | 1 | -5/+32 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'js/exec-path-coverity-workaround' into maint | Junio C Hamano | 2017-01-31 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ |