Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mw/symlinks' | Junio C Hamano | 2014-02-27 |
|\ | |||
| * | setup: don't dereference in-tree symlinks for absolute paths | Martin Erik Werner | 2014-02-04 |
| * | t0060: add tests for prefix_path when path begins with work tree | Martin Erik Werner | 2014-02-04 |
| * | t0060: add test for prefix_path when path == work tree | Martin Erik Werner | 2014-02-04 |
| * | t0060: add test for prefix_path on symlinks via absolute paths | Martin Erik Werner | 2014-02-04 |
| * | t3004: add test for ls-files on symlinks via absolute paths | Junio C Hamano | 2014-02-04 |
* | | Merge branch 'nd/test-rename-reset' | Junio C Hamano | 2014-02-27 |
|\ \ | |||
| * | | t7101, t7014: rename test files to indicate what that file is for | Nguyễn Thái Ngọc Duy | 2014-02-04 |
* | | | Merge branch 'wk/submodule-on-branch' | Junio C Hamano | 2014-02-27 |
|\ \ \ | |||
| * | | | submodule: explicit local branch creation in module_clone | W. Trevor King | 2014-02-24 |
* | | | | Merge branch 'nd/diff-quiet-stat-dirty' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ | |||
| * | | | | diff: do not quit early on stat-dirty files | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ | |||
| * | | | | pathspec: pass directory indicator to match_pathspec_item() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | pathspec: rename match_pathspec_depth() to match_pathspec() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
* | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ \ | |||
| * | | | | | merge-recursive.c: tolerate missing files while refreshing index | Brad King | 2014-02-24 |
| * | | | | | t3030-merge-recursive: test known breakage with empty work tree | Brad King | 2014-02-24 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'da/pull-ff-configuration' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ \ | |||
| * | | | | | pull: add pull.ff configuration | David Aguilar | 2014-01-15 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'kb/fast-hashmap' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ \ | |||
| * | | | | | add a hashtable implementation that supports O(1) removal | Karsten Blees | 2013-11-18 |
* | | | | | | Merge branch 'nv/commit-gpgsign-config' | Junio C Hamano | 2014-02-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | test the commit.gpgsign config option | Nicolas Vigier | 2014-02-24 |
* | | | | | | | Merge branch 'aj/ada-diff-word-pattern' | Junio C Hamano | 2014-02-07 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | userdiff: update Ada patterns | Adrian Johnson | 2014-02-05 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jn/pager-lv-default-env' | Junio C Hamano | 2014-01-31 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pager test: make fake pager consume all its input | Jonathan Nieder | 2014-01-31 |
* | | | | | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | tree_entry_interesting: match against all pathspecs | Andy Spencer | 2014-01-27 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/test-fixes' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | t7700: do not use "touch" unnecessarily | Jeff King | 2014-01-23 |
| * | | | | | | | t7501: fix "empty commit" test with NO_PERL | Jeff King | 2014-01-23 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/negative-pathspec' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting() | Nguyễn Thái Ngọc Duy | 2014-01-23 |
* | | | | | | | | Merge branch 'pw/git-p4' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git p4 test: examine behavior with locked (+l) files | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4: handle files with wildcards when doing RCS scrubbing | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4 test: do not pollute /tmp | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4 test: run as user "author" | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4 test: is_cli_file_writeable succeeds | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4 test: explicitly check p4 wildcard delete | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4: work around p4 bug that causes empty symlinks | Pete Wyckoff | 2014-01-22 |
| * | | | | | | | | git p4 test: ensure p4 symlink parsing works | Pete Wyckoff | 2014-01-21 |
| * | | | | | | | | git p4 test: wildcards are supported | Pete Wyckoff | 2014-01-21 |
* | | | | | | | | | Merge branch 'jk/mark-edges-uninteresting' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/perf: time rev-list with UNINTERESTING commits | Jeff King | 2014-01-21 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/interpret-branch-name-fix' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | interpret_branch_name: find all possible @-marks | Jeff King | 2014-01-15 |
| * | | | | | | | | | interpret_branch_name: avoid @{upstream} past colon | Jeff King | 2014-01-15 |