summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | | | | Merge branch 'nd/reset-intent-to-add'Junio C Hamano2014-02-275-15/+50
|\ \ \ \ \ \
| * | | | | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-addNguyễn Thái Ngọc Duy2014-02-055-15/+50
| |/ / / / /
* | | | | | Merge branch 'ks/tree-diff-walk'Junio C Hamano2014-02-275-59/+10
|\ \ \ \ \ \
| * | | | | | tree-walk: finally switch over tree descriptors to contain a pre-parsed entryks/tree-diff-walkKirill Smelkov2014-02-242-2/+2
| * | | | | | revision: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-11/+1
| * | | | | | line-log: convert to using diff_tree_sha1()Kirill Smelkov2014-02-051-24/+2
| * | | | | | tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old...Kirill Smelkov2014-02-051-14/+1
| * | | | | | tree-diff: allow diff_tree_sha1 to accept NULL sha1Kirill Smelkov2014-02-051-8/+4
| |/ / / / /
* | | | | | Merge branch 'mw/symlinks'Junio C Hamano2014-02-273-20/+112
|\ \ \ \ \ \
| * | | | | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-043-22/+12
| * | | | | | setup: add abspath_part_inside_repo() functionMartin Erik Werner2014-02-041-0/+64
| * | | | | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | | | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | | | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | | | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | | | | Merge branch 'nd/test-rename-reset'Junio C Hamano2014-02-272-0/+0
|\ \ \ \ \ \ \
| * | | | | | | t7101, t7014: rename test files to indicate what that file is fornd/test-rename-resetNguyễn Thái Ngọc Duy2014-02-042-0/+0
* | | | | | | | Merge branch 'wk/submodule-on-branch'Junio C Hamano2014-02-274-42/+135
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: describe 'submodule update --remote' use casewk/submodule-on-branchW. Trevor King2014-02-241-0/+10
| * | | | | | | | submodule: explicit local branch creation in module_cloneW. Trevor King2014-02-244-27/+110
| * | | | | | | | submodule: document module_clone arguments in commentsW. Trevor King2014-02-241-0/+6
| * | | | | | | | submodule: make 'checkout' update_module mode more explicitW. Trevor King2014-02-241-16/+11
* | | | | | | | | Merge branch 'ep/varscope'Junio C Hamano2014-02-277-19/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/gc.c: reduce scope of variablesep/varscopeElia Pinto2014-01-311-2/+3
| * | | | | | | | | builtin/fetch.c: reduce scope of variableElia Pinto2014-01-311-1/+1
| * | | | | | | | | builtin/commit.c: reduce scope of variablesElia Pinto2014-01-311-5/+6
| * | | | | | | | | builtin/clean.c: reduce scope of variableElia Pinto2014-01-311-1/+2
| * | | | | | | | | builtin/blame.c: reduce scope of variablesElia Pinto2014-01-311-3/+3
| * | | | | | | | | builtin/apply.c: reduce scope of variablesElia Pinto2014-01-311-6/+6
| * | | | | | | | | bisect.c: reduce scope of variableElia Pinto2014-01-311-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bs/stdio-undef-before-redef'Junio C Hamano2014-02-271-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-compat-util.h: #undef (v)snprintf before #define thembs/stdio-undef-before-redefBenoit Sigoure2014-01-311-0/+6
* | | | | | | | | | Merge branch 'jk/config-path-include-fix'Junio C Hamano2014-02-272-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | handle_path_include: don't look at NULL valuejk/config-path-include-fixJeff King2014-01-281-1/+5
| * | | | | | | | | | expand_user_path: do not look at NULL pathJeff King2014-01-281-1/+1
* | | | | | | | | | | Merge branch 'ds/rev-parse-required-args'Junio C Hamano2014-02-271-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-parse: check i before using argv[i] against argcds/rev-parse-required-argsDavid Sharp2014-01-281-6/+11
* | | | | | | | | | | | Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano2014-02-273-24/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirtyNguyễn Thái Ngọc Duy2014-02-243-5/+25
| * | | | | | | | | | | | diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy2014-02-241-21/+28
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-2722-76/+89
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clean: use cache_name_is_other()nd/submodule-pathspec-ending-with-slashNguyễn Thái Ngọc Duy2014-02-241-19/+2
| * | | | | | | | | | | | clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+1
| * | | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-246-9/+20
| * | | | | | | | | | | | match_pathspec: match pathspec "foo/" against directory "foo"Nguyễn Thái Ngọc Duy2014-02-241-1/+6
| * | | | | | | | | | | | dir.c: prepare match_pathspec_item for taking more flagsNguyễn Thái Ngọc Duy2014-02-241-6/+13
| * | | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-247-25/+27
| * | | | | | | | | | | | pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy2014-02-245-8/+12
| * | | | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-2414-22/+24