Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-04-17 | 1 | -0/+19 |
|\ | |||||
| * | difftool: fix use-after-free | Johannes Schindelin | 2017-04-14 | 1 | -0/+19 |
* | | Merge branch 'sb/show-diff-for-submodule-in-diff-fix' | Junio C Hamano | 2017-04-17 | 1 | -0/+29 |
|\ \ | |||||
| * | | diff: submodule inline diff to initialize env array. | Stefan Beller | 2017-04-02 | 1 | -0/+29 |
* | | | Merge branch 'jk/loose-object-info-report-error' | Junio C Hamano | 2017-04-17 | 1 | -0/+24 |
|\ \ \ | |||||
| * | | | index-pack: detect local corruption in collision check | Jeff King | 2017-04-01 | 1 | -0/+17 |
| * | | | sha1_loose_object_info: return error for corrupted objects | Jeff King | 2017-04-01 | 1 | -0/+7 |
| * | | | Merge branch 'sb/t3600-rephrase' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint | Junio C Hamano | 2017-03-28 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'st/verify-tag' into maint | Junio C Hamano | 2017-03-28 | 2 | -14/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dp/filter-branch-prune-empty' into maint | Junio C Hamano | 2017-03-28 | 2 | -0/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint | Junio C Hamano | 2017-03-28 | 2 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 2 | -0/+141 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/cond-skip-tests' into maint | Junio C Hamano | 2017-03-28 | 3 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ident-empty' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/delta-chain-limit' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+93 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-with-stdin' into maint | Junio C Hamano | 2017-03-28 | 2 | -8/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/interop-test' into maint | Junio C Hamano | 2017-03-28 | 7 | -1/+267 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/perf-updates' into maint | Junio C Hamano | 2017-03-28 | 3 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/log-decorate-default-to-auto' | Junio C Hamano | 2017-04-11 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | log: if --decorate is not given, default to --decorate=auto | Alex Henrie | 2017-03-24 | 1 | -1/+9 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/ref-filter-no-contains' | Junio C Hamano | 2017-04-11 | 4 | -14/+316 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | tag: add tests for --with and --without | Ævar Arnfjörð Bjarmason | 2017-03-24 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | | ref-filter: add --no-contains option to tag/branch/for-each-ref | Ævar Arnfjörð Bjarmason | 2017-03-24 | 3 | -7/+193 |
| * | | | | | | | | | | | | | | | | | | | tag: change --point-at to default to HEAD | Ævar Arnfjörð Bjarmason | 2017-03-24 | 1 | -1/+8 |
| * | | | | | | | | | | | | | | | | | | | tag: implicitly supply --list given another list-like option | Ævar Arnfjörð Bjarmason | 2017-03-24 | 1 | -5/+50 |
| * | | | | | | | | | | | | | | | | | | | tag: change misleading --list <pattern> documentation | Ævar Arnfjörð Bjarmason | 2017-03-24 | 1 | -0/+25 |
| * | | | | | | | | | | | | | | | | | | | tag: add more incompatibles mode tests | Ævar Arnfjörð Bjarmason | 2017-03-24 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | | | | | | tag tests: fix a typo in a test description | Ævar Arnfjörð Bjarmason | 2017-03-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | tag: remove a TODO item from the test suite | Ævar Arnfjörð Bjarmason | 2017-03-23 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | | | | ref-filter: add test for --contains on a non-commit | Ævar Arnfjörð Bjarmason | 2017-03-23 | 2 | -1/+12 |
| * | | | | | | | | | | | | | | | | | | | ref-filter: make combining --merged & --no-merged an error | Ævar Arnfjörð Bjarmason | 2017-03-21 | 3 | -0/+12 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-reword-to-run-hooks' | Junio C Hamano | 2017-03-30 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | sequencer: allow the commit-msg hooks to run during a `reword` | Johannes Schindelin | 2017-03-27 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | t7504: document regression: reword no longer calls commit-msg | Johannes Schindelin | 2017-03-22 | 1 | -0/+17 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/case-insensitive-upstream-and-push-marker' | Junio C Hamano | 2017-03-30 | 2 | -6/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | rev-parse: match @{upstream}, @{u} and @{push} case-insensitively | Ævar Arnfjörð Bjarmason | 2017-03-27 | 2 | -6/+17 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/test-readme-updates' | Junio C Hamano | 2017-03-30 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t/README: clarify the test_have_prereq documentation | Ævar Arnfjörð Bjarmason | 2017-03-27 | 1 | -3/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | t/README: change "Inside <X> part" to "Inside the <X> part" | Ævar Arnfjörð Bjarmason | 2017-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | t/README: link to metacpan.org, not search.cpan.org | Ævar Arnfjörð Bjarmason | 2017-03-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/freebsd-getcwd-workaround' | Junio C Hamano | 2017-03-30 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD | René Scharfe | 2017-03-27 | 1 | -0/+14 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/config-case-cmdline-take-2' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-no-index-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/remote-helpers-with-git-dir' into maint | Junio C Hamano | 2017-03-24 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/send-email-one-cc' into maint | Junio C Hamano | 2017-03-21 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/t6300-cleanup' into maint | Junio C Hamano | 2017-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |