Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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` | 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() | 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 limitation | Junio C Hamano | 2016-10-01 | 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 specification | 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 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 spacing | Philip Oakley | 2016-10-25 | 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" | 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 !SANITY | 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 branches | 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_MEM | 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 |
* | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 | 4 | -4/+112 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch: use "quick" has_sha1_file for tag following | Jeff King | 2016-10-14 | 4 | -4/+112 |
* | | | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 | 2 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-base: handle --fork-point without reflog | Jeff King | 2016-10-12 | 2 | -0/+9 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint | Junio C Hamano | 2016-10-28 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | worktree: allow the main brach of a bare repository to be checked out | Dennis Kaarsemaker | 2016-10-14 | 2 | -0/+10 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path' into maint | Junio C Hamano | 2016-10-28 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | documentation: improve submodule.<name>.{url, path} description | Stefan Beller | 2016-10-11 | 1 | -5/+6 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/ref-symlink-loop' into maint | Junio C Hamano | 2016-10-28 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | files_read_raw_ref: prevent infinite retry loops in general | Jeff King | 2016-10-10 | 1 | -0/+7 |
| * | | | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 | 2 | -1/+11 |
* | | | | | | | | | | | Merge branch 'nd/commit-p-doc' into maint | Junio C Hamano | 2016-10-28 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-commit.txt: clarify --patch mode with pathspec | Duy Nguyen | 2016-10-05 | 1 | -2/+4 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ |