summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MSVC: link in invalidcontinue.obj for better POSIX compatibilitymr/msvc-link-with-invalidcontinueMarat Radchenko2014-03-281-1/+1
* Git 1.9.1v1.9.1Junio C Hamano2014-03-184-3/+63
* Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-182-11/+25
|\
| * clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * clean: respect pathspecs with "-d"Jeff King2014-03-112-2/+19
* | Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-182-16/+16
|\ \
| * | t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
| * | difftool: support repositories with .git-filesDavid Aguilar2014-02-241-16/+2
| |/
* | Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-182-1/+19
|\ \
| * | remote: handle pushremote config in any orderjk/remote-pushremote-config-readingJeff King2014-02-242-1/+19
| |/
* | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-186-11/+96
|\ \
| * | show_ident_date: fix tz range checkJeff King2014-03-071-2/+2
| * | log: do not segfault on gmtime errorsJeff King2014-02-242-2/+12
| * | log: handle integer overflow in timestampsJeff King2014-02-242-2/+24
| * | date: check date overflow against time_tJeff King2014-02-243-1/+19
| * | fsck: report integer overflow in author timestampsJeff King2014-02-242-6/+20
| * | t4212: test bogus timestamps with git-logJeff King2014-02-241-0/+21
* | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-182-3/+32
|\ \ \
| * | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-182-3/+32
* | | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-182-3/+15
|\ \ \ \
| * | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-182-3/+15
| | |_|/ | |/| |
* | | | Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-182-22/+43
|\ \ \ \
| * | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-062-0/+13
| * | | | t0003: do not chdir the whole test processJunio C Hamano2014-02-061-22/+30
* | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-184-14/+70
|\ \ \ \ \
| * | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-242-2/+3
| * | | | | read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-243-12/+16
| * | | | | read-cache.c: refactor --ignore-missing implementationBrad King2014-02-242-3/+7
| * | | | | t3030-merge-recursive: test known breakage with empty work treeBrad King2014-02-241-0/+47
| | |_|/ / | |/| | |
* | | | | Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
|\ \ \ \ \
| * | | | | rev-parse: check i before using argv[i] against argcds/rev-parse-required-argsDavid Sharp2014-01-281-6/+11
* | | | | | Merge branch 'jk/config-path-include-fix' into maintJunio C Hamano2014-03-182-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 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-183-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/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-1812-37/+105
|\ \ \ \ \ \ \
| * | | | | | | t5537: move http tests out to t5539nd/http-fetch-shallow-fixNguyễn Thái Ngọc Duy2014-02-132-57/+82
| * | | | | | | fetch-pack: fix deepen shallow over smart http with no-done capNguyễn Thái Ngọc Duy2014-02-102-1/+32
| * | | | | | | protocol-capabilities.txt: document no-doneNguyễn Thái Ngọc Duy2014-02-101-0/+12
| * | | | | | | protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txtNguyễn Thái Ngọc Duy2014-02-101-0/+6
| * | | | | | | pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'Nguyễn Thái Ngọc Duy2014-02-101-1/+2
| * | | | | | | test: rename http fetch and push test filesNguyễn Thái Ngọc Duy2014-02-104-0/+0
| * | | | | | | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-1822-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