Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 | 1 | -2/+6 |
|\ | |||||
| * | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 | 1 | -2/+6 |
* | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | completion: add --continue option for merge | Chris Packham | 2016-12-14 | 1 | -1/+1 |
* | | | Merge branch 'bb/unicode-9.0' | Junio C Hamano | 2016-12-19 | 3 | -0/+56 |
|\ \ \ | |||||
| * | | | update_unicode.sh: remove the plane filter | Beat Bolli | 2016-12-14 | 1 | -2/+1 |
| * | | | update_unicode.sh: automatically download newer definition files | Beat Bolli | 2016-12-14 | 1 | -6/+2 |
| * | | | update_unicode.sh: pin the uniset repo to a known good commit | Beat Bolli | 2016-12-13 | 1 | -1/+2 |
| * | | | update_unicode.sh: remove an unnecessary subshell level | Beat Bolli | 2016-12-13 | 1 | -27/+26 |
| * | | | update_unicode.sh: move it into contrib/update-unicode | Beat Bolli | 2016-12-13 | 3 | -0/+61 |
* | | | | Merge branch 'nd/rebase-forget' | Junio C Hamano | 2016-12-19 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forget | Nguyễn Thái Ngọc Duy | 2016-12-11 | 1 | -2/+2 |
* | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-11-01 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | cocci: avoid self-references in object_id transformationsrs/cocci | René Scharfe | 2016-11-01 | 1 | -0/+15 |
| * | | | | Merge branch 'jc/cocci-xstrdup-or-null' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 | 4 | -6/+52 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-10-31 | 1 | -0/+128 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | contrib/long-running-filter: add long running filter example | Lars Schneider | 2016-10-17 | 1 | -0/+128 |
* | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null' | Junio C Hamano | 2016-10-26 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-null | Junio C Hamano | 2016-10-12 | 1 | -0/+7 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'rs/copy-array' into maint | Junio C Hamano | 2016-10-11 | 1 | -0/+26 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mm/credential-libsecret' | Junio C Hamano | 2016-10-26 | 2 | -0/+395 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib: add credential helper for libsecretmm/credential-libsecret | Mantas Mikulėnas | 2016-10-11 | 2 | -0/+395 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-17 | 1 | -0/+5 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | remove unnecessary NULL check before free(3) | René Scharfe | 2016-10-10 | 1 | -0/+5 |
* | | | | | | Merge branch 'cp/completion-negative-refs' | Junio C Hamano | 2016-10-10 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: support excluding refscp/completion-negative-refs | Chris Packham | 2016-08-24 | 1 | -3/+4 |
| * | | | | | | Merge branch 'cp/completion-clone-recurse-submodules' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'pm/build-persistent-https-with-recent-go' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'da/subtree-2.9-regression' into maint | Junio C Hamano | 2016-08-10 | 2 | -8/+25 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remove unnecessary check before QSORT | René Scharfe | 2016-09-29 | 1 | -0/+18 |
| * | | | | | | | | | | add QSORT | René Scharfe | 2016-09-29 | 1 | -0/+19 |
* | | | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-06 | 2 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | 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 | 1 | -0/+6 |
| * | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 | René Scharfe | 2016-09-27 | 1 | -0/+6 |
| * | | | | | | | | | | gitignore: ignore output files of coccicheck make target | René Scharfe | 2016-09-27 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'rs/copy-array' | Junio C Hamano | 2016-10-03 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | use COPY_ARRAYrs/copy-array | René Scharfe | 2016-09-25 | 1 | -0/+26 |
* | | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-26 | 2 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 | 1 | -0/+5 |
| * | | | | | | | | contrib/coccinelle: fix semantic patch for oid_to_hex_r() | René Scharfe | 2016-09-15 | 1 | -6/+6 |
* | | | | | | | | | diff-highlight: avoid highlighting combined diffsbh/diff-highlight-graph | Jeff King | 2016-08-31 | 2 | -1/+38 |
* | | | | | | | | | diff-highlight: add multi-byte tests | Jeff King | 2016-08-31 | 1 | -1/+35 |
* | | | | | | | | | diff-highlight: ignore test cruft | Jeff King | 2016-08-31 | 1 | -0/+2 |
* | | | | | | | | | diff-highlight: add support for --graph output | Brian Henderson | 2016-08-29 | 2 | -7/+14 |
* | | | | | | | | | diff-highlight: add failing test for handling --graph output | Brian Henderson | 2016-08-29 | 1 | -0/+62 |
* | | | | | | | | | diff-highlight: add some tests | Brian Henderson | 2016-08-29 | 3 | -0/+190 |
|/ / / / / / / / | |||||
* | | | | | | | | git-multimail: update to release 1.4.0 | Matthieu Moy | 2016-08-17 | 6 | -276/+725 |