Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/test-copy-bytes-fix' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+1 |
|\ | |||||
| * | t: handle EOF in test_copy_bytes() | Jeff King | 2017-07-17 | 1 | -0/+1 |
* | | Merge branch 'pw/unquote-path-in-git-pm' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+7 |
|\ \ | |||||
| * | | t9700: add tests for Git::unquote_path() | Phillip Wood | 2017-06-30 | 1 | -0/+7 |
* | | | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+21 |
|\ \ \ | |||||
| * | | | gc: run pre-detach operations under lock | Jeff King | 2017-07-12 | 1 | -0/+21 |
* | | | | Merge branch 'tb/push-to-cygwin-unc-path' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | cygwin: allow pushing to UNC paths | Torsten Bögershausen | 2017-07-05 | 1 | -0/+2 |
* | | | | | Merge branch 'js/alias-case-sensitivity' into maint | Junio C Hamano | 2017-07-22 | 1 | -0/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | alias: compare alias name *case-insensitively* | Johannes Schindelin | 2017-07-17 | 1 | -1/+1 |
| * | | | | t1300: demonstrate that CamelCased aliases regressed | Johannes Schindelin | 2017-07-17 | 1 | -0/+7 |
* | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-13 | 1 | -0/+44 |
|\ \ \ \ \ | |||||
| * | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 1 | -0/+44 |
* | | | | | | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-13 | 2 | -0/+21 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 1 | -0/+4 |
| * | | | | | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 1 | -0/+6 |
| * | | | | | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 1 | -0/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'js/fsck-name-object' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t1450: use egrep for regexp "alternation" | Junio C Hamano | 2017-06-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -4/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5534: fix misleading grep invocation | Johannes Schindelin | 2017-07-05 | 1 | -4/+10 |
* | | | | | | | Merge branch 'cc/shared-index-permfix' into maint | Junio C Hamano | 2017-07-10 | 3 | -11/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t1700: make sure split-index respects core.sharedrepository | Christian Couder | 2017-06-25 | 1 | -0/+30 |
| * | | | | | | | t1301: move modebits() to test-lib-functions.sh | Christian Couder | 2017-06-25 | 2 | -11/+12 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ks/t7508-indent-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7508: fix a broken indentation | Kaartic Sivaraam | 2017-06-21 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 | 1 | -52/+43 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4005: modernize style and drop hard coded sha1 | Stefan Beller | 2017-06-09 | 1 | -52/+43 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+57 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: check git diffs for mutually exclusive header lines | René Scharfe | 2017-06-27 | 1 | -0/+18 |
| * | | | | | | | | apply: check git diffs for invalid file modes | René Scharfe | 2017-06-27 | 1 | -1/+15 |
| * | | | | | | | | apply: check git diffs for missing old filenames | René Scharfe | 2017-06-27 | 1 | -0/+24 |
* | | | | | | | | | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 2 | -5/+140 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t3420: fix under GETTEXT_POISON build | Junio C Hamano | 2017-06-23 | 1 | -2/+2 |
| * | | | | | | | | | rebase: add more regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -2/+69 |
| * | | | | | | | | | rebase: add regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -3/+64 |
| * | | | | | | | | | rebase -i: add test for reflog message | Phillip Wood | 2017-06-19 | 1 | -0/+7 |
* | | | | | | | | | | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add--interactive: quote commentChar regex | Jeff King | 2017-06-21 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | alias: use the early config machinery to expand aliases | 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 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3200: add test for single parameter passed to -m option | Sahil Dua | 2017-06-13 | 1 | -0/+17 |
* | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5100: add some more mailinfo tests | Kyle J. McKay | 2017-06-12 | 1 | -0/+42 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdir | Patrick Steinhardt | 2017-06-13 | 1 | -0/+16 |