Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/rebase-am-fork-point' | Junio C Hamano | 2014-07-27 | 1 | -0/+23 |
|\ | |||||
| * | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-point | John Keeping | 2014-07-16 | 1 | -0/+23 |
* | | Merge branch 'cc/replace-graft' | Junio C Hamano | 2014-07-27 | 1 | -25/+114 |
|\ \ | |||||
| * | | replace: add test for --graft with a mergetagcc/replace-graft | Christian Couder | 2014-07-21 | 1 | -0/+22 |
| * | | replace: add test for --graft with signed commit | Christian Couder | 2014-07-21 | 1 | -0/+24 |
| * | | replace: add test for --graft | Christian Couder | 2014-07-21 | 1 | -1/+44 |
| * | | replace: cleanup redirection style in tests | Christian Couder | 2014-07-07 | 1 | -24/+24 |
* | | | Merge branch 'jk/stable-prio-queue' | Junio C Hamano | 2014-07-27 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | t5539: update a flaky testjk/stable-prio-queue | Jeff King | 2014-07-15 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/tag-sort' | Junio C Hamano | 2014-07-23 | 1 | -20/+56 |
|\ \ \ | |||||
| * | | | tag: support configuring --sort via .gitconfigjk/tag-sort | Jacob Keller | 2014-07-17 | 1 | -0/+36 |
| * | | | tag: fix --sort tests to use cat<<-\EOF format | Jacob Keller | 2014-07-13 | 1 | -20/+20 |
* | | | | Merge branch 'kb/perf-trace' | Junio C Hamano | 2014-07-22 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | trace: disable additional trace output for unit tests | Karsten Blees | 2014-07-13 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'ek/alt-odb-entry-fix' | Junio C Hamano | 2014-07-21 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | sha1_file: do not add own object directory as alternateek/alt-odb-entry-fix | Ephrim Khong | 2014-07-15 | 1 | -0/+24 |
* | | | | | Merge branch 'kb/hashmap-updates' | Junio C Hamano | 2014-07-21 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | hashmap: add string interning APIkb/hashmap-updates | Karsten Blees | 2014-07-07 | 1 | -0/+13 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jl/submodule-tests' | Junio C Hamano | 2014-07-21 | 14 | -0/+974 |
|\ \ \ \ \ | |||||
| * | | | | | revert: add t3513 for submodule updatesjl/submodule-tests | Jens Lehmann | 2014-07-14 | 1 | -0/+32 |
| * | | | | | stash: add t3906 for submodule updates | Jens Lehmann | 2014-07-14 | 2 | -5/+42 |
| * | | | | | am: add t4255 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+21 |
| * | | | | | cherry-pick: add t3512 for submodule updates | Jens Lehmann | 2014-07-14 | 2 | -3/+25 |
| * | | | | | pull: add t5572 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+45 |
| * | | | | | rebase: add t3426 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+46 |
| * | | | | | merge: add t7613 for submodule updates | Jens Lehmann | 2014-07-14 | 2 | -3/+40 |
| * | | | | | bisect: add t6041 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+32 |
| * | | | | | reset: add t7112 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+14 |
| * | | | | | read-tree: add t1013 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+12 |
| * | | | | | apply: add t4137 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+20 |
| * | | | | | checkout: call the new submodule update test framework | Jens Lehmann | 2014-07-14 | 1 | -0/+5 |
| * | | | | | submodules: add the lib-submodule-update.sh test library | Jens Lehmann | 2014-07-14 | 1 | -0/+640 |
| * | | | | | test-lib: add test_dir_is_empty() | Jens Lehmann | 2014-06-20 | 1 | -0/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jl/test-lint-scripts' | Junio C Hamano | 2014-07-16 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | t/Makefile: always test all lint targets when running testsjl/test-lint-scripts | Jens Lehmann | 2014-07-10 | 1 | -1/+1 |
| * | | | | | t/Makefile: check helper scripts for non-portable shell commands too | Jens Lehmann | 2014-07-10 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'zk/log-graph-showsig' | Junio C Hamano | 2014-07-16 | 1 | -0/+31 |
|\ \ \ \ \ | |||||
| * | | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsig | Zoltan Klinger | 2014-07-09 | 1 | -0/+31 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' | Junio C Hamano | 2014-07-16 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-merges | Charles Bailey | 2014-07-01 | 1 | -0/+11 |
* | | | | | | Merge branch 'mk/merge-incomplete-files' | Junio C Hamano | 2014-07-16 | 1 | -3/+88 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-files | Max Kirillov | 2014-06-30 | 1 | -0/+85 |
| * | | | | | | t6023-merge-file.sh: fix and mark as broken invalid tests | Max Kirillov | 2014-06-30 | 1 | -3/+3 |
* | | | | | | | Merge branch 'tb/crlf-tests' | Junio C Hamano | 2014-07-16 | 2 | -61/+326 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t0027: combinations of core.autocrlf, core.eol and text | Torsten Bögershausen | 2014-07-08 | 1 | -0/+265 |
| * | | | | | | | t0025: rename the test files | Torsten Bögershausen | 2014-07-08 | 1 | -61/+61 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 2 | -0/+196 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | t1700: new tests for split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+194 |
| * | | | | | | t2104: make sure split index mode is off for the version test | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+2 |
* | | | | | | | Merge branch 'dt/refs-check-refname-component-sse-fix' | Junio C Hamano | 2014-07-10 | 1 | -4/+11 |
|\ \ \ \ \ \ \ |