Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/colored-push-errors' | Junio C Hamano | 2018-05-08 | 1 | -0/+12 |
|\ | |||||
| * | push: test to verify that push errors are colored | Johannes Schindelin | 2018-04-24 | 1 | -0/+12 |
* | | Merge branch 'jc/parseopt-expiry-errors' | Junio C Hamano | 2018-05-08 | 1 | -0/+10 |
|\ \ | |||||
| * | | parseopt: handle malformed --expire arguments more nicely | Junio C Hamano | 2018-04-23 | 1 | -0/+10 |
* | | | Merge branch 'ma/fast-export-skip-merge-fix' | Junio C Hamano | 2018-05-08 | 1 | -0/+18 |
|\ \ \ | |||||
| * | | | fast-export: fix regression skipping some merge-commits | Martin Ă…gren | 2018-04-21 | 1 | -0/+18 |
* | | | | Merge branch 'bt/gpg-interface' | Junio C Hamano | 2018-05-08 | 1 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | gpg-interface: find the last gpg signature line | Jeff King | 2018-04-16 | 1 | -0/+11 |
| * | | | | t7004: fix mistaken tag name | Jeff King | 2018-04-16 | 1 | -1/+1 |
* | | | | | Merge branch 'hn/sort-ls-remote' | Junio C Hamano | 2018-05-08 | 1 | -7/+47 |
|\ \ \ \ \ | |||||
| * | | | | | ls-remote: create '--sort' option | Harald Nordgren | 2018-04-09 | 1 | -7/+47 |
| |/ / / / | |||||
* | | | | | Merge branch 'tb/config-default' | Junio C Hamano | 2018-05-08 | 2 | -0/+66 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/config: introduce `color` type specifier | Taylor Blau | 2018-04-23 | 1 | -0/+30 |
| * | | | | | builtin/config: introduce `--default` | Taylor Blau | 2018-04-23 | 1 | -0/+36 |
* | | | | | | Merge branch 'tb/config-type' | Junio C Hamano | 2018-05-08 | 1 | -1/+64 |
|\| | | | | | |||||
| * | | | | | builtin/config.c: support `--type=<type>` as preferred alias for `--<type>` | Taylor Blau | 2018-04-19 | 1 | -3/+55 |
| * | | | | | builtin/config.c: treat type specifiers singularly | Taylor Blau | 2018-04-10 | 1 | -0/+11 |
| |/ / / / | |||||
* | | | | | Merge branch 'tq/t1510' | Junio C Hamano | 2018-05-08 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | t1510-repo-setup.sh: remove useless mkdir | Tao Qingyun | 2018-04-17 | 1 | -1/+0 |
| |/ / / / | |||||
* | | | | | Merge branch 'ls/checkout-encoding' | Junio C Hamano | 2018-05-08 | 1 | -0/+245 |
|\ \ \ \ \ | |||||
| * | | | | | convert: add round trip check based on 'core.checkRoundtripEncoding' | Lars Schneider | 2018-04-16 | 1 | -0/+39 |
| * | | | | | convert: add tracing for 'working-tree-encoding' attribute | Lars Schneider | 2018-04-16 | 1 | -0/+2 |
| * | | | | | convert: check for detectable errors in UTF encodings | Lars Schneider | 2018-04-16 | 1 | -0/+62 |
| * | | | | | convert: add 'working-tree-encoding' attribute | Lars Schneider | 2018-04-16 | 1 | -0/+142 |
* | | | | | | Merge branch 'sb/object-store-replace' | Junio C Hamano | 2018-05-08 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refs: add repository argument to get_main_ref_store | Stefan Beller | 2018-04-12 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'ds/commit-graph' | Junio C Hamano | 2018-05-08 | 1 | -0/+224 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit-graph: implement "--append" option | Derrick Stolee | 2018-04-11 | 1 | -0/+10 |
| * | | | | | | commit-graph: build graph from starting commits | Derrick Stolee | 2018-04-11 | 1 | -0/+13 |
| * | | | | | | commit-graph: read only from specific pack-indexes | Derrick Stolee | 2018-04-11 | 1 | -0/+10 |
| * | | | | | | commit: integrate commit graph with commit parsing | Derrick Stolee | 2018-04-11 | 1 | -1/+46 |
| * | | | | | | commit-graph: implement git commit-graph read | Derrick Stolee | 2018-04-11 | 1 | -5/+27 |
| * | | | | | | commit-graph: implement git-commit-graph write | Derrick Stolee | 2018-04-02 | 1 | -0/+124 |
| * | | | | | | Merge branch 'jk/cached-commit-buffer' into HEAD | Junio C Hamano | 2018-03-13 | 1 | -31/+0 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'js/empty-config-section-fix' | Junio C Hamano | 2018-05-08 | 1 | -3/+99 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git_config_set: reuse empty sections | Johannes Schindelin | 2018-04-09 | 1 | -1/+1 |
| * | | | | | | | | git config --unset: remove empty sections (in the common case) | Johannes Schindelin | 2018-04-09 | 1 | -2/+2 |
| * | | | | | | | | t1300: `--unset-all` can leave an empty section behind (bug) | Johannes Schindelin | 2018-04-09 | 1 | -0/+11 |
| * | | | | | | | | t1300: add a few more hairy examples of sections becoming empty | Johannes Schindelin | 2018-04-09 | 1 | -1/+44 |
| * | | | | | | | | t1300: remove unreasonable expectation from TODO | Johannes Schindelin | 2018-04-06 | 1 | -1/+20 |
| * | | | | | | | | t1300: avoid relying on a bug | Johannes Schindelin | 2018-04-06 | 1 | -0/+2 |
| * | | | | | | | | config --replace-all: avoid extra line breaks | Johannes Schindelin | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | | t1300: demonstrate that --replace-all can "invent" newlines | Johannes Schindelin | 2018-04-06 | 1 | -0/+21 |
| * | | | | | | | | t1300: rename it to reflect that `repo-config` was deprecated | Johannes Schindelin | 2018-04-06 | 1 | -0/+0 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/submodule-move-nested' | Junio C Hamano | 2018-05-08 | 2 | -4/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule: fixup nested submodules after moving the submodule | Stefan Beller | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | | submodule-config: add repository argument to submodule_from_{name, path} | Stefan Beller | 2018-03-29 | 1 | -2/+4 |
| * | | | | | | | | submodule-config: allow submodule_free to handle arbitrary repositories | Stefan Beller | 2018-03-29 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'dj/runtime-prefix' | Junio C Hamano | 2018-05-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | exec_cmd: RUNTIME_PREFIX on some POSIX systems | Dan Jacques | 2018-04-11 | 1 | -1/+1 |