Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | t: use test_decode_color rather than literal ANSI codes | Jeff King | 2017-07-13 | 4 | -39/+44 | |
* | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-07-12 | 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' | Junio C Hamano | 2017-07-10 | 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 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+17 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+42 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+16 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+7 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-24 | 2 | -0/+105 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'jc/name-rev-lw-tag' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 1 | -3/+3 | |
* | | | | | | | | | | Merge branch 'pw/unquote-path-in-git-pm' | Junio C Hamano | 2017-07-10 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pm | Phillip Wood | 2017-06-30 | 1 | -0/+7 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal' | Junio C Hamano | 2017-07-10 | 1 | -0/+23 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removal | Kaartic Sivaraam | 2017-06-30 | 1 | -0/+23 | |
* | | | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' | Junio C Hamano | 2017-07-06 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fix | Johannes Schindelin | 2017-07-05 | 1 | -4/+10 | |
* | | | | | | | | | | | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2017-07-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t1450: use egrep for regexp "alternation"js/fsck-name-object | Junio C Hamano | 2017-06-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'cc/shared-index-permfix' | Junio C Hamano | 2017-07-05 | 3 | -11/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfix | 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 'rs/sha1-name-readdir-optim' | Junio C Hamano | 2017-07-05 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | p4205: add perf test script for pretty log formats | René Scharfe | 2017-06-24 | 1 | -0/+16 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | 1 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | ls-files: use repository objectbw/repo-object | Brandon Williams | 2017-06-23 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ \ \ \ | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-23 | 5 | -1/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vs/typofixes' | Junio C Hamano | 2017-06-30 | 9 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Spelling fixesvs/typofixes | Ville Skyttä | 2017-06-27 | 9 | -12/+12 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/apply-validate-input' | Junio C Hamano | 2017-06-30 | 3 | -1/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-input | 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 'ks/status-initial-commit' | Junio C Hamano | 2017-06-30 | 2 | -1/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | status: contextually notify user about an initial commitks/status-initial-commit | Kaartic Sivaraam | 2017-06-21 | 2 | -1/+31 | |
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'ab/t3070-test-dedup' into maint | Junio C Hamano | 2017-06-13 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/memihash-opt' into maint | Junio C Hamano | 2017-06-13 | 1 | -5/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/pull-ff-rebase-autostash' into maint | Junio C Hamano | 2017-06-13 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sl/clean-d-ignored-fix' into maint | Junio C Hamano | 2017-06-13 | 2 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/skip-test-in-the-middle' into maint | Junio C Hamano | 2017-06-13 | 2 | -50/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/forking-and-threading' into maint | Junio C Hamano | 2017-06-13 | 2 | -2/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/bug-to-abort' into maint | Junio C Hamano | 2017-06-13 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/checkout-recurse-submodules' into maint | Junio C Hamano | 2017-06-13 | 3 | -8/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/rebase-i-regression-fix-tests' | Junio C Hamano | 2017-06-30 | 2 | -5/+140 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-tests | 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 |