Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-sh-setup: be explicit where to dot-source git-sh-i18n from.ak/sh-setup-dot-source-i18n-fix | Anders Kaseorg | 2016-10-30 | 1 | -3/+3 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/daemon-path-ok-check-truncation' into maint | Junio C Hamano | 2016-11-29 | 1 | -4/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | daemon: detect and reject too-long pathsjk/daemon-path-ok-check-truncation | Jeff King | 2016-10-24 | 1 | -4/+21 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rs/ring-buffer-wraparound' into maint | Junio C Hamano | 2016-11-29 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | hex: make wraparound of the index into ring-buffer explicitrs/ring-buffer-wraparound | René Scharfe | 2016-10-26 | 2 | -2/+4 | |
* | | | | | | | | | | | | | | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 | 3 | -10/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Git.pm: add comment pointing to t9000mm/send-email-cc-cruft-after-address | Matthieu Moy | 2016-10-21 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | t9000-addresses: update expected results after fix | Matthieu Moy | 2016-10-21 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | parse_mailboxes: accept extra text after <...> address | Matthieu Moy | 2016-10-14 | 2 | -6/+36 | |
* | | | | | | | | | | | | | | | Merge branch 'cp/completion-negative-refs' into maint | Junio C Hamano | 2016-11-29 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | completion: support excluding refscp/completion-negative-refs | Chris Packham | 2016-08-24 | 1 | -3/+4 | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/am-read-author-file' into maint | Junio C Hamano | 2016-11-29 | 1 | -58/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am: refactor read_author_script()jc/am-read-author-file | Junio C Hamano | 2016-08-30 | 1 | -58/+45 | |
* | | | | | | | | | | | | | | | | Git 2.10.2v2.10.2 | Junio C Hamano | 2016-10-28 | 3 | -2/+69 | |
* | | | | | | | | | | | | | | | | Merge branch 'pb/test-parse-options-expect' into maint | Junio C Hamano | 2016-10-28 | 1 | -170/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expect | Pranit Bauva | 2016-10-17 | 1 | -170/+13 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null' into maint | Junio C Hamano | 2016-10-28 | 7 | -20/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-null | Junio C Hamano | 2016-10-12 | 7 | -20/+17 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 | 15 | -45/+99 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 3 | René Scharfe | 2016-10-10 | 4 | -20/+15 | |
| * | | | | | | | | | | | | | | | | | | remove unnecessary NULL check before free(3) | René Scharfe | 2016-10-10 | 2 | -2/+6 | |
| * | | | | | | | | | | | | | | | | | | coccicheck: make transformation for strbuf_addf(sb, "...") more precise | René Scharfe | 2016-10-03 | 1 | -3/+26 | |
| * | | | | | | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2 | René Scharfe | 2016-09-27 | 4 | -4/+9 | |
| * | | | | | | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 | René Scharfe | 2016-09-27 | 3 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | | gitignore: ignore output files of coccicheck make target | René Scharfe | 2016-09-27 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 | 7 | -12/+18 | |
| * | | | | | | | | | | | | | | | | | | add coccicheck make target | René Scharfe | 2016-09-15 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | | | | | | contrib/coccinelle: fix semantic patch for oid_to_hex_r() | René Scharfe | 2016-09-15 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-comments | Junio C Hamano | 2016-09-30 | 1 | -1/+22 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pretty-format-color-doc-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fix | René Scharfe | 2016-10-11 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/reset-usage' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | reset: fix usagejs/reset-usage | Johannes Schindelin | 2016-10-11 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'po/fix-doc-merge-base-illustration' into maint | Junio C Hamano | 2016-10-28 | 2 | -21/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustration | Philip Oakley | 2016-10-24 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | | | doc: fix merge-base ASCII art tab spacing | Philip Oakley | 2016-10-21 | 1 | -13/+13 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tap-verbose-fix' into maint | Junio C Hamano | 2016-10-28 | 3 | -5/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | test-lib: bail out when "-v" used under "prove"jk/tap-verbose-fix | Jeff King | 2016-10-24 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | travis: use --verbose-log test option | Jeff King | 2016-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | test-lib: add --verbose-log option | Jeff King | 2016-10-21 | 2 | -3/+25 | |
| * | | | | | | | | | | | | | | | | | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spaces | Jeff King | 2016-10-21 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fix | Junio C Hamano | 2016-10-20 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc' into maint | Junio C Hamano | 2016-10-28 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-doc | Brandon Williams | 2016-10-19 | 2 | -3/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-10-28 | 1 | -11/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | inline xalloc_flex() into FLEXPTR_ALLOC_MEMjk/tighten-alloc | René Scharfe | 2016-10-17 | 1 | -9/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM | René Scharfe | 2016-10-17 | 1 | -2/+3 |