Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 |
|\ | |||
| * | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 |
* | | Merge branch 'da/difftool-git-files' into maint | Junio C Hamano | 2014-03-18 |
|\ \ | |||
| * | | t7800: add a difftool test for .git-files | Junio C Hamano | 2014-03-05 |
| |/ | |||
* | | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 |
|\ \ | |||
| * | | remote: handle pushremote config in any order | Jeff King | 2014-02-24 |
| |/ | |||
* | | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 |
|\ \ | |||
| * | | log: do not segfault on gmtime errors | Jeff King | 2014-02-24 |
| * | | log: handle integer overflow in timestamps | Jeff King | 2014-02-24 |
| * | | fsck: report integer overflow in author timestamps | Jeff King | 2014-02-24 |
| * | | t4212: test bogus timestamps with git-log | Jeff King | 2014-02-24 |
* | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ | |||
| * | | | diff: do not reuse_worktree_file for submodules | Thomas Rast | 2014-02-18 |
* | | | | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ | |||
| * | | | | reset: optionally setup worktree and refresh index on --mixed | Nguyễn Thái Ngọc Duy | 2014-02-18 |
| | |_|/ | |/| | | |||
| * | | | Merge branch 'bm/merge-base-octopus-dedup' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jc/revision-range-unpeel' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jk/allow-fetch-onelevel-refname' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/interpret-branch-name-fix' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'ow/stash-with-ifs' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/lift-parent-count-limit' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/add-empty-fix' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/log-decoration' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/commit-v-strip-marker' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | check-attr: move to the top of working tree when in non-bare repository | Junio C Hamano | 2014-02-06 |
| * | | | | | | | | | | | | | | | t0003: do not chdir the whole test process | Junio C Hamano | 2014-02-06 |
* | | | | | | | | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | 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 'nd/diff-quiet-stat-dirty' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diff: do not quit early on stat-dirty files | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| |/ / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | Merge branch 'nd/http-fetch-shallow-fix' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | t5537: move http tests out to t5539 | Nguyễn Thái Ngọc Duy | 2014-02-13 |
| * | | | | | | | | | | | | | | | | fetch-pack: fix deepen shallow over smart http with no-done cap | Nguyễn Thái Ngọc Duy | 2014-02-10 |
| * | | | | | | | | | | | | | | | | test: rename http fetch and push test files | Nguyễn Thái Ngọc Duy | 2014-02-10 |
| * | | | | | | | | | | | | | | | | tests: auto-set LIB_HTTPD_PORT from test name | Jeff King | 2014-02-10 |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | 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 '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 |