Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'ps/common-info-doc' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | doc: fix location of 'info/' with $GIT_COMMON_DIRps/common-info-doc | Patrick Steinhardt | 2016-11-11 | 1 | -1/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | cocci: avoid self-references in object_id transformationsrs/cocci | René Scharfe | 2016-11-01 | 1 | -0/+15 | |
* | | | | | | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | valgrind: support test helpersnd/test-helpers | René Scharfe | 2016-10-27 | 2 | -3/+18 | |
* | | | | | | | | | | | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fix | Stefan Christ | 2016-10-28 | 1 | -2/+2 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | commit: simplify building parents listrs/commit-pptr-simplify | René Scharfe | 2016-10-30 | 1 | -8/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfix | Jeff King | 2016-10-30 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'ak/pre-receive-hook-template-modefix' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | pre-receive.sample: mark it executableak/pre-receive-hook-template-modefix | Anders Kaseorg | 2016-10-28 | 1 | -0/+0 | |
* | | | | | | | | | | | | Merge branch 'ls/macos-update' into maint | Junio C Hamano | 2016-11-29 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-update | Lars Schneider | 2016-11-10 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Makefile: set NO_OPENSSL on macOS by default | Lars Schneider | 2016-11-10 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 | 1 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 | |
| * | | | | | | | | | | | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 | |
| * | | | | | | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 | |
| * | | | | | | | | | | | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 | |
| * | | | | | | | | | | | | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | 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 |