Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | submodule update: learn `--[no-]recommend-shallow` option | Stefan Beller | 2016-05-27 | 1 | -0/+52 |
* | Merge branch 'da/difftool' | Junio C Hamano | 2016-05-23 | 1 | -0/+23 |
|\ | |||||
| * | difftool: handle unmerged files in dir-diff modeda/difftool | David Aguilar | 2016-05-16 | 1 | -0/+23 |
| * | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 | 2 | -5/+126 |
| |\ | |||||
| * \ | Merge branch 'jk/use-write-script-more' into maint | Junio C Hamano | 2016-05-02 | 3 | -18/+20 |
| |\ \ | |||||
| * \ \ | Merge branch 'ad/commit-have-m-option' into maint | Junio C Hamano | 2016-05-02 | 1 | -0/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into maint | Junio C Hamano | 2016-05-02 | 1 | -0/+41 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/branch-shortening-funny-symrefs' into maint | Junio C Hamano | 2016-05-02 | 1 | -0/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ky/branch-m-worktree' into maint | Junio C Hamano | 2016-05-02 | 1 | -1/+22 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ky/branch-d-worktree' into maint | Junio C Hamano | 2016-05-02 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sk/send-pack-all-fix' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sg/diff-multiple-identical-renames' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-z-n-unquoted' | Junio C Hamano | 2016-05-23 | 13 | -111/+121 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquoted | Jeff King | 2016-05-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | t9103: modernize test style | Jeff King | 2016-05-14 | 1 | -10/+12 |
| * | | | | | | | | | | | | t9107: switch inverted single/double quotes in test | Jeff King | 2016-05-14 | 1 | -2/+3 |
| * | | | | | | | | | | | | t9107: use "return 1" instead of "exit 1" | Jeff King | 2016-05-14 | 1 | -16/+26 |
| * | | | | | | | | | | | | t9100,t3419: enclose all test code in single-quotes | Jeff King | 2016-05-13 | 2 | -20/+20 |
| * | | | | | | | | | | | | t/lib-git-svn: drop $remote_git_svn and $git_svn_id | Jeff King | 2016-05-13 | 11 | -63/+60 |
* | | | | | | | | | | | | | Merge branch 'ar/diff-args-osx-precompose' | Junio C Hamano | 2016-05-23 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precompose | Alexander Rinass | 2016-05-13 | 1 | -0/+42 |
* | | | | | | | | | | | | | | Merge branch 'js/perf-rebase-i' | Junio C Hamano | 2016-05-23 | 2 | -8/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | perf: run "rebase -i" under perf | Johannes Schindelin | 2016-05-13 | 1 | -0/+36 |
| * | | | | | | | | | | | | | | perf: make the tests work in worktrees | Johannes Schindelin | 2016-05-13 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | perf: let's disable symlinks when they are not available | Johannes Schindelin | 2016-05-13 | 1 | -1/+4 |
* | | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect' | Junio C Hamano | 2016-05-23 | 2 | -60/+93 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expect | Junio C Hamano | 2016-05-10 | 1 | -18/+2 |
| * | | | | | | | | | | | | | | | t0040: remove unused test helpers | Junio C Hamano | 2016-05-10 | 1 | -24/+0 |
| * | | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify tests | Junio C Hamano | 2016-05-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | test-parse-options: fix output when callback option fails | Junio C Hamano | 2016-05-10 | 1 | -3/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config' | Junio C Hamano | 2016-05-23 | 3 | -71/+244 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 1 | -0/+51 |
| * | | | | | | | | | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffs | Pranit Bauva | 2016-05-05 | 1 | -7/+9 |
| * | | | | | | | | | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 1 | -14/+14 |
| * | | | | | | | | | | | | | | | t/t7507: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+5 |
| * | | | | | | | | | | | | | | | t0040-parse-options: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+114 |
| * | | | | | | | | | | | | | | | test-parse-options: print quiet as integer | Pranit Bauva | 2016-04-19 | 1 | -13/+13 |
| * | | | | | | | | | | | | | | | t0040-test-parse-options.sh: fix style issues | Pranit Bauva | 2016-04-19 | 1 | -38/+38 |
* | | | | | | | | | | | | | | | | Merge branch 'xy/format-patch-base' | Junio C Hamano | 2016-05-23 | 1 | -0/+105 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configuration | Xiaolong Ye | 2016-04-26 | 1 | -0/+19 |
| * | | | | | | | | | | | | | | | | format-patch: introduce --base=auto option | Xiaolong Ye | 2016-04-26 | 1 | -0/+39 |
| * | | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree info | Xiaolong Ye | 2016-04-26 | 1 | -0/+47 |
* | | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 1 | -170/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 |
| * | | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | 1 | -0/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-heads | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | worktree.c: check whether branch is bisected in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -0/+13 |