Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'nd/reset-setup-worktree' | Junio C Hamano | 2014-03-14 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktree | Nguyễn Thái Ngọc Duy | 2014-02-18 | 1 | -0/+11 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'bm/merge-base-octopus-dedup' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+39 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/revision-range-unpeel' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/allow-fetch-onelevel-refname' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/interpret-branch-name-fix' into maint | Junio C Hamano | 2014-02-13 | 2 | -1/+51 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/config-file-stdin' | Junio C Hamano | 2014-03-14 | 2 | -3/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdin | Kirill A. Shutemov | 2014-02-18 | 2 | -3/+30 | |
| * | | | | | | | | | | | | | config: disallow relative include paths from blobs | Jeff King | 2014-02-18 | 1 | -0/+16 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/gitignore-trailing-whitespace' | Junio C Hamano | 2014-03-14 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t0008: skip trailing space test on Windows | Johannes Sixt | 2014-03-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | dir: ignore trailing spaces in exclude patterns | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | dir: warn about trailing spaces in exclude patterns | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+31 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'ow/stash-with-ifs' into maint | Junio C Hamano | 2014-02-05 | 1 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/lift-parent-count-limit' into maint | Junio C Hamano | 2014-02-05 | 2 | -1/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/add-empty-fix' into maint | Junio C Hamano | 2014-02-05 | 1 | -0/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/log-decoration' into maint | Junio C Hamano | 2014-02-05 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/commit-v-strip-marker' into maint | Junio C Hamano | 2014-02-05 | 1 | -1/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint | Junio C Hamano | 2014-02-05 | 2 | -21/+198 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' | Junio C Hamano | 2014-03-14 | 1 | -22/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-tree | Junio C Hamano | 2014-02-06 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | t0003: do not chdir the whole test process | Junio C Hamano | 2014-02-06 | 1 | -22/+30 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' | Junio C Hamano | 2014-03-07 | 1 | -7/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspec | Junio C Hamano | 2013-04-26 | 1 | -7/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/run-network-tests-by-default' | Junio C Hamano | 2014-03-05 | 3 | -14/+74 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | tests: turn on network daemon tests by defaultjk/run-network-tests-by-default | Jeff King | 2014-02-14 | 3 | -14/+74 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/daemonize-gc' | Junio C Hamano | 2014-03-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | gc: config option for running --auto in background | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/combine-diff' | Junio C Hamano | 2014-03-05 | 2 | -0/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | tests: add checking that combine-diff emits only correct pathsks/combine-diff | Kirill Smelkov | 2014-02-24 | 1 | -0/+106 | |
| * | | | | | | | | | | | | | | | | | | | | | diff test: add tests for combine-diff with orderfile | Kirill Smelkov | 2014-02-24 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/http-fetch-shallow-fix' | Junio C Hamano | 2014-02-27 | 6 | -27/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | t5537: move http tests out to t5539nd/http-fetch-shallow-fix | Nguyễn Thái Ngọc Duy | 2014-02-13 | 2 | -57/+82 | |
| * | | | | | | | | | | | | | | | | | | | | | | fetch-pack: fix deepen shallow over smart http with no-done cap | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+30 | |
| * | | | | | | | | | | | | | | | | | | | | | | test: rename http fetch and push test files | Nguyễn Thái Ngọc Duy | 2014-02-10 | 4 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-02-27 | 2 | -0/+196 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | pack-bitmap: implement optional name_hash cache | Vicent Marti | 2013-12-30 | 2 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | t/perf: add tests for pack bitmaps | Jeff King | 2013-12-30 | 1 | -0/+56 | |
| * | | | | | | | | | | | | | | | | | | | | | | t: add basic bitmap functionality tests | Jeff King | 2013-12-30 | 1 | -0/+138 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-ports' | Junio C Hamano | 2014-02-27 | 10 | -10/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | tests: auto-set git-daemon portjk/test-ports | Jeff King | 2014-02-10 | 2 | -2/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | tests: auto-set LIB_HTTPD_PORT from test name | Jeff King | 2014-02-10 | 8 | -8/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/reset-intent-to-add' | Junio C Hamano | 2014-02-27 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-add | Nguyễn Thái Ngọc Duy | 2014-02-05 | 1 | -0/+15 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mw/symlinks' | Junio C Hamano | 2014-02-27 | 2 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | setup: don't dereference in-tree symlinks for absolute paths | Martin Erik Werner | 2014-02-04 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | t0060: add tests for prefix_path when path begins with work tree | Martin Erik Werner | 2014-02-04 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | t0060: add test for prefix_path when path == work tree | Martin Erik Werner | 2014-02-04 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | t0060: add test for prefix_path on symlinks via absolute paths | Martin Erik Werner | 2014-02-04 | 1 | -0/+5 |