Commit message (Expand) | Author | Age | |
---|---|---|---|
* | i18n: advice: internationalize message for conflicts | Vasco Almeida | 2016-06-17 |
* | i18n: advice: mark string about detached head for translation | Vasco Almeida | 2016-06-17 |
* | Merge branch 'jc/t2300-setup' into HEAD | Junio C Hamano | 2016-06-07 |
|\ | |||
| * | t2300: run git-sh-setup in an environment that better mimics the real life | Junio C Hamano | 2016-06-01 |
| * | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-05-31 |
| |\ | |||
| * \ | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint | Junio C Hamano | 2016-05-31 |
| |\ \ | |||
| * \ \ | Merge branch 'js/name-rev-use-oldest-ref' into maint | Junio C Hamano | 2016-05-31 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jc/fsck-nul-in-commit' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'js/windows-dotgit' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'lp/typofixes' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'sb/z-is-gnutar-ism' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'va/i18n-misc-updates' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'ak/t4151-ls-files-could-be-empty' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/test-seq' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/t5601-sed-fix' into maint | Junio C Hamano | 2016-05-26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/difftool' | Junio C Hamano | 2016-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | difftool: handle unmerged files in dir-diff mode | David Aguilar | 2016-05-16 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/use-write-script-more' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ad/commit-have-m-option' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/branch-shortening-funny-symrefs' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ky/branch-m-worktree' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ky/branch-d-worktree' into maint | Junio C Hamano | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/send-pack-all-fix' into maint | Junio C Hamano | 2016-04-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/diff-multiple-identical-renames' into maint | Junio C Hamano | 2016-04-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-z-n-unquoted' | Junio C Hamano | 2016-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always quote shell arguments to test -z/-n | Jeff King | 2016-05-14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9103: modernize test style | Jeff King | 2016-05-14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9107: switch inverted single/double quotes in test | Jeff King | 2016-05-14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9107: use "return 1" instead of "exit 1" | Jeff King | 2016-05-14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9100,t3419: enclose all test code in single-quotes | Jeff King | 2016-05-13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-git-svn: drop $remote_git_svn and $git_svn_id | Jeff King | 2016-05-13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/diff-args-osx-precompose' | Junio C Hamano | 2016-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: run arguments through precompose_argv | Alexander Rinass | 2016-05-13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/perf-rebase-i' | Junio C Hamano | 2016-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: run "rebase -i" under perf | Johannes Schindelin | 2016-05-13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: make the tests work in worktrees | Johannes Schindelin | 2016-05-13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: let's disable symlinks when they are not available | Johannes Schindelin | 2016-05-13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect' | Junio C Hamano | 2016-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |