Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-09-01 | 2 | -0/+91 |
|\ | |||||
| * | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-18 | 1 | -0/+39 |
| * | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-18 | 1 | -0/+40 |
| * | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller | 2015-08-18 | 1 | -0/+12 |
* | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-09-01 | 1 | -0/+9 |
|\ \ | |||||
| * | | config: silence warnings for command names with invalid keys | Jeff King | 2015-08-24 | 1 | -0/+9 |
* | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-09-01 | 1 | -0/+153 |
|\ \ \ | |||||
| * | | | submodule: allow erroneous values for the fetchRecurseSubmodules option | Heiko Voigt | 2015-08-19 | 1 | -0/+35 |
| * | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -2/+35 |
| * | | | submodule: implement a config API for lookup of .gitmodules values | Heiko Voigt | 2015-08-19 | 1 | -0/+85 |
* | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-09-01 | 1 | -0/+22 |
|\ \ \ \ | |||||
| * | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -0/+22 |
* | | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-08-28 | 1 | -1/+14 |
|\ \ \ \ \ | |||||
| * | | | | | trailer: retitle a test and correct an in-comment message | Christian Couder | 2015-08-26 | 1 | -1/+1 |
| * | | | | | trailer: ignore first line of message | Christian Couder | 2015-08-21 | 1 | -1/+14 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dt/untracked-subdir' | Junio C Hamano | 2015-08-28 | 1 | -2/+98 |
|\ \ \ \ \ | |||||
| * | | | | | untracked cache: fix entry invalidation | Nguyễn Thái Ngọc Duy | 2015-08-19 | 1 | -1/+27 |
| * | | | | | untracked-cache: fix subdirectory handling | David Turner | 2015-08-19 | 1 | -1/+71 |
* | | | | | | Merge branch 'sg/t3020-typofix' | Junio C Hamano | 2015-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3020: fix typo in test description | SZEDER Gábor | 2015-08-20 | 1 | -1/+1 |
* | | | | | | | Merge branch 'dt/untracked-sparse' | Junio C Hamano | 2015-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | t7063: use --force-untracked-cache to speed up a bit | Nguyễn Thái Ngọc Duy | 2015-08-19 | 1 | -1/+1 |
* | | | | | | | Merge branch 'pt/am-builtin-abort-fix' | Junio C Hamano | 2015-08-27 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into index | Paul Tan | 2015-08-19 | 1 | -0/+24 |
* | | | | | | | | Merge branch 'pt/am-builtin-options' | Junio C Hamano | 2015-08-25 | 2 | -4/+130 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: let --signoff override --no-signoff | Paul Tan | 2015-08-12 | 1 | -0/+20 |
| * | | | | | | | | am: let command-line options override saved options | Paul Tan | 2015-08-12 | 1 | -0/+82 |
| * | | | | | | | | test_terminal: redirect child process' stdin to a pty | Paul Tan | 2015-08-12 | 1 | -4/+28 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dt/notes-multiple' | Junio C Hamano | 2015-08-25 | 1 | -0/+72 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: handle multiple worktrees | David Turner | 2015-08-11 | 1 | -0/+72 |
* | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t2019: skip test requiring '*' in a file name non Windows | Johannes Sixt | 2015-08-12 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ee/clean-remove-dirs' | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7300-clean: require POSIXPERM for chmod 0 test | Johannes Sixt | 2015-08-12 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 1 | -111/+85 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add_to_alternates_file: don't add duplicate entries | Jeff King | 2015-08-11 | 1 | -0/+5 |
| * | | | | | | | | | | | t5700: modernize style | Jeff King | 2015-08-11 | 1 | -112/+81 |
* | | | | | | | | | | | | Merge branch 'ps/guess-repo-name-at-root' | Junio C Hamano | 2015-08-19 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | clone: do not use port number as dir name | Patrick Steinhardt | 2015-08-10 | 1 | -7/+7 |
| * | | | | | | | | | | | | clone: do not include authentication data in guessed dir | Patrick Steinhardt | 2015-08-10 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' | Junio C Hamano | 2015-08-19 | 1 | -0/+106 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | clone: use computed length in guess_dir_name | Jeff King | 2015-08-10 | 1 | -6/+6 |
| * | | | | | | | | | | | | clone: add tests for output directory | Jeff King | 2015-08-10 | 1 | -0/+106 |
* | | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | refs: support negative transfer.hideRefs | Jeff King | 2015-08-07 | 1 | -0/+23 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jk/test-with-x' | Junio C Hamano | 2015-08-19 | 1 | -2/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | test-lib: disable trace when test is not verbose | Jeff King | 2015-08-07 | 1 | -2/+6 |
| * | | | | | | | | | | | | | test-lib: turn off "-x" tracing during chain-lint check | Jeff King | 2015-08-07 | 1 | -0/+5 |
* | | | | | | | | | | | | | | Merge branch 'ps/t1509-chroot-test-fixup' | Junio C Hamano | 2015-08-19 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | tests: fix cleanup after tests in t1509-root-worktree | Patrick Steinhardt | 2015-08-05 | 1 | -1/+1 |