Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | code and test: fix misuses of "nor"jl/nor-or-nand-and | Justin Lebar | 2014-03-31 | 7 | -7/+7 |
* | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+16 |
|\ | |||||
| * | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 | 1 | -0/+16 |
* | | Merge branch 'da/difftool-git-files' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+14 |
|\ \ | |||||
| * | | t7800: add a difftool test for .git-filesda/difftool-git-files | Junio C Hamano | 2014-03-05 | 1 | -0/+14 |
| |/ | |||||
* | | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+13 |
|\ \ | |||||
| * | | remote: handle pushremote config in any orderjk/remote-pushremote-config-reading | Jeff King | 2014-02-24 | 1 | -0/+13 |
| |/ | |||||
* | | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 | 2 | -0/+59 |
|\ \ | |||||
| * | | log: do not segfault on gmtime errors | Jeff King | 2014-02-24 | 1 | -0/+8 |
| * | | log: handle integer overflow in timestamps | Jeff King | 2014-02-24 | 1 | -0/+16 |
| * | | fsck: report integer overflow in author timestamps | Jeff King | 2014-02-24 | 1 | -0/+14 |
| * | | t4212: test bogus timestamps with git-log | Jeff King | 2014-02-24 | 1 | -0/+21 |
* | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+29 |
|\ \ \ | |||||
| * | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktree | Thomas Rast | 2014-02-18 | 1 | -1/+29 |
* | | | | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 | 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 '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' into maint | Junio C Hamano | 2014-03-18 | 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 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursive | Brad King | 2014-02-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | t3030-merge-recursive: test known breakage with empty work tree | Brad King | 2014-02-24 | 1 | -0/+47 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'nd/diff-quiet-stat-dirty' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirty | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'nd/http-fetch-shallow-fix' into maint | Junio C Hamano | 2014-03-18 | 9 | -35/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | tests: auto-set LIB_HTTPD_PORT from test name | Jeff King | 2014-02-10 | 8 | -8/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | Merge branch 'aj/ada-diff-word-pattern' | Junio C Hamano | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | userdiff: update Ada patternsaj/ada-diff-word-pattern | Adrian Johnson | 2014-02-05 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env' | Junio C Hamano | 2014-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | pager test: make fake pager consume all its inputjn/pager-lv-default-env | Jonathan Nieder | 2014-01-31 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut' | Junio C Hamano | 2014-01-27 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cut | Andy Spencer | 2014-01-27 | 1 | -0/+13 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/test-fixes' | Junio C Hamano | 2014-01-27 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |