Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mh/packed-ref-store-prep' | Junio C Hamano | 2017-06-26 | 1 | -0/+14 |
|\ | |||||
| * | for_each_bisect_ref(): don't trim refnames | Michael Haggerty | 2017-06-18 | 1 | -0/+14 |
* | | Merge branch 'lb/status-stash-count' | Junio C Hamano | 2017-06-26 | 1 | -0/+32 |
|\ \ | |||||
| * | | status: add optional stash count information | Liam Beguin | 2017-06-18 | 1 | -0/+32 |
* | | | Merge branch 'jk/warn-add-gitlink' | Junio C Hamano | 2017-06-24 | 4 | -9/+52 |
|\ \ \ | |||||
| * | | | t: move "git add submodule" into test blocksjk/warn-add-gitlink | Jeff King | 2017-06-15 | 3 | -9/+15 |
| * | | | add: warn when adding an embedded repository | Jeff King | 2017-06-15 | 1 | -0/+37 |
* | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 2 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 2 | -0/+2 |
* | | | | | Merge branch 'js/alias-early-config' | Junio C Hamano | 2017-06-24 | 3 | -1/+20 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | alias: use the early config machinery to expand aliasesjs/alias-early-config | Johannes Schindelin | 2017-06-15 | 1 | -1/+1 |
| * | | | | t7006: demonstrate a problem with aliases in subdirectories | Johannes Schindelin | 2017-06-15 | 1 | -0/+11 |
| * | | | | t1308: relax the test verifying that empty alias values are disallowed | Johannes Schindelin | 2017-06-15 | 1 | -1/+3 |
| * | | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | 1 | -0/+6 |
* | | | | | Merge branch 'ab/wildmatch-glob-slash-test' | Junio C Hamano | 2017-06-24 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | wildmatch test: cover a blind spot in "/" matchingab/wildmatch-glob-slash-test | Ævar Arnfjörð Bjarmason | 2017-06-15 | 1 | -0/+2 |
* | | | | | | Merge branch 'rs/strbuf-addftime-zZ' | Junio C Hamano | 2017-06-22 | 1 | -2/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZ | Jeff King | 2017-06-15 | 1 | -0/+1 |
| * | | | | | | t0006: check --date=format zone offsets | Jeff King | 2017-06-15 | 1 | -2/+7 |
| * | | | | | | strbuf: let strbuf_addftime handle %z and %Z itself | René Scharfe | 2017-06-15 | 1 | -0/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sd/t3200-branch-m-test' | Junio C Hamano | 2017-06-22 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-test | Sahil Dua | 2017-06-13 | 1 | -0/+17 |
| * | | | | | | Merge branch 'sd/t3200-typofix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sb/t5531-update-desc' into maint | Junio C Hamano | 2017-06-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tb/dedup-crlf-tests' into maint | Junio C Hamano | 2017-06-05 | 2 | -187/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/alternate-ref-optim' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/clone-add-empty-config-from-command-line' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/use-trailer-api-in-commands' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/push-options-doc' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/eol-on-ourselves' into maint | Junio C Hamano | 2017-06-04 | 7 | -25/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/disable-pack-reuse-when-broken' into maint | Junio C Hamano | 2017-06-04 | 1 | -3/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/submodule-with-bs-path' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/log-decorate-default-to-auto' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/fix-poison-tests' into maint | Junio C Hamano | 2017-06-04 | 15 | -34/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/doc-replace-gmane-links' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix' | Junio C Hamano | 2017-06-22 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fix | Patrick Steinhardt | 2017-06-13 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure' | Junio C Hamano | 2017-06-22 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failure | Kyle J. McKay | 2017-06-12 | 1 | -0/+42 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/t4005-modernize' | Junio C Hamano | 2017-06-22 | 1 | -52/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | t4005: modernize style and drop hard coded sha1sb/t4005-modernize | Stefan Beller | 2017-06-10 | 1 | -52/+43 |
| |/ / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/consistent-h' | Junio C Hamano | 2017-06-19 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | t0012: test "-h" with builtinsjk/consistent-h | Jeff King | 2017-06-05 | 1 | -0/+12 |
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/perf-remove-index-lock' | Junio C Hamano | 2017-06-19 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | perf: work around the tested repo having an index.lockab/perf-remove-index-lock | Ævar Arnfjörð Bjarmason | 2017-06-05 | 1 | -1/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-19 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | grep: add support for PCRE v2 | Ævar Arnfjörð Bjarmason | 2017-06-02 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | log: add -P as a synonym for --perl-regexp | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+12 |