Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/difftool-git-files' | Junio C Hamano | 2014-03-14 | 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 'tg/index-v4-format' | Junio C Hamano | 2014-03-14 | 4 | -0/+89 |
|\ \ | |||||
| * | | read-cache: add index.version config variabletg/index-v4-format | Thomas Gummerer | 2014-02-24 | 1 | -0/+27 |
| * | | test-lib: allow setting the index format version | Thomas Gummerer | 2014-02-24 | 3 | -0/+13 |
| * | | introduce GIT_INDEX_VERSION environment variable | Thomas Gummerer | 2014-02-24 | 1 | -0/+49 |
* | | | Merge branch 'jk/remote-pushremote-config-reading' | Junio C Hamano | 2014-03-14 | 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' | Junio C Hamano | 2014-03-14 | 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 'jh/note-trees-record-blobs' | Junio C Hamano | 2014-03-14 | 1 | -0/+27 |
|\ \ \ \ | |||||
| * | | | | notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobs | Johan Herland | 2014-02-20 | 1 | -0/+27 |
* | | | | | Merge branch 'nd/no-more-fnmatch' | Junio C Hamano | 2014-03-14 | 1 | -13/+0 |
|\ \ \ \ \ | |||||
| * | | | | | stop using fnmatch (either native or compat) | Nguyễn Thái Ngọc Duy | 2014-02-20 | 1 | -13/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' | Junio C Hamano | 2014-03-14 | 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' | Junio C Hamano | 2014-03-14 | 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 'ks/config-file-stdin' | Junio C Hamano | 2014-03-14 | 2 | -3/+46 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdin | Kirill A. Shutemov | 2014-02-18 | 2 | -3/+30 |
| * | | | | | | | | | | config: disallow relative include paths from blobs | Jeff King | 2014-02-18 | 1 | -0/+16 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/gitignore-trailing-whitespace' | Junio C Hamano | 2014-03-14 | 1 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0008: skip trailing space test on Windows | Johannes Sixt | 2014-03-11 | 1 | -1/+1 |
| * | | | | | | | | | | dir: ignore trailing spaces in exclude patterns | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -4/+4 |
| * | | | | | | | | | | dir: warn about trailing spaces in exclude patterns | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+31 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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' | Junio C Hamano | 2014-03-14 | 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 'jn/add-2.0-u-A-sans-pathspec' | Junio C Hamano | 2014-03-07 | 1 | -7/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspec | Junio C Hamano | 2013-04-26 | 1 | -7/+2 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/run-network-tests-by-default' | Junio C Hamano | 2014-03-05 | 3 | -14/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | tests: turn on network daemon tests by defaultjk/run-network-tests-by-default | Jeff King | 2014-02-14 | 3 | -14/+74 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/daemonize-gc' | Junio C Hamano | 2014-03-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | gc: config option for running --auto in background | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ks/combine-diff' | Junio C Hamano | 2014-03-05 | 2 | -0/+127 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | tests: add checking that combine-diff emits only correct pathsks/combine-diff | Kirill Smelkov | 2014-02-24 | 1 | -0/+106 |