summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/notes-merge-config'Junio C Hamano2015-09-012-0/+91
|\
| * notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-181-0/+39
| * notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-181-0/+40
| * notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-181-0/+12
* | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-09-011-0/+9
|\ \
| * | config: silence warnings for command names with invalid keysJeff King2015-08-241-0/+9
* | | Merge branch 'hv/submodule-config'Junio C Hamano2015-09-011-0/+153
|\ \ \
| * | | submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt2015-08-191-0/+35
| * | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-2/+35
| * | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-191-0/+85
* | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-09-011-0/+22
|\ \ \ \
| * | | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-101-0/+22
* | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-08-281-1/+14
|\ \ \ \ \
| * | | | | trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-261-1/+1
| * | | | | trailer: ignore first line of messageChristian Couder2015-08-211-1/+14
| | |_|/ / | |/| | |
* | | | | Merge branch 'dt/untracked-subdir'Junio C Hamano2015-08-281-2/+98
|\ \ \ \ \
| * | | | | untracked cache: fix entry invalidationNguyễn Thái Ngọc Duy2015-08-191-1/+27
| * | | | | untracked-cache: fix subdirectory handlingDavid Turner2015-08-191-1/+71
* | | | | | Merge branch 'sg/t3020-typofix'Junio C Hamano2015-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | t3020: fix typo in test descriptionSZEDER Gábor2015-08-201-1/+1
* | | | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-271-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | t7063: use --force-untracked-cache to speed up a bitNguyễn Thái Ngọc Duy2015-08-191-1/+1
* | | | | | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-271-0/+24
|\ \ \ \ \ \ \
| * | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2015-08-191-0/+24
* | | | | | | | Merge branch 'pt/am-builtin-options'Junio C Hamano2015-08-252-4/+130
|\ \ \ \ \ \ \ \
| * | | | | | | | am: let --signoff override --no-signoffPaul Tan2015-08-121-0/+20
| * | | | | | | | am: let command-line options override saved optionsPaul Tan2015-08-121-0/+82
| * | | | | | | | test_terminal: redirect child process' stdin to a ptyPaul Tan2015-08-121-4/+28
| |/ / / / / / /
* | | | | | | | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-0/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: handle multiple worktreesDavid Turner2015-08-111-0/+72
* | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-08-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt2015-08-121-1/+1
* | | | | | | | | | Merge branch 'ee/clean-remove-dirs'Junio C Hamano2015-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7300-clean: require POSIXPERM for chmod 0 testJohannes Sixt2015-08-121-1/+1
* | | | | | | | | | | Merge branch 'jk/git-path'Junio C Hamano2015-08-191-111/+85
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add_to_alternates_file: don't add duplicate entriesJeff King2015-08-111-0/+5
| * | | | | | | | | | | t5700: modernize styleJeff King2015-08-111-112/+81
* | | | | | | | | | | | Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2015-08-191-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: do not use port number as dir namePatrick Steinhardt2015-08-101-7/+7
| * | | | | | | | | | | | clone: do not include authentication data in guessed dirPatrick Steinhardt2015-08-101-2/+2
* | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2015-08-191-0/+106
|\| | | | | | | | | | | |
| * | | | | | | | | | | | clone: use computed length in guess_dir_nameJeff King2015-08-101-6/+6
| * | | | | | | | | | | | clone: add tests for output directoryJeff King2015-08-101-0/+106
* | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-191-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs: support negative transfer.hideRefsJeff King2015-08-071-0/+23
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/test-with-x'Junio C Hamano2015-08-191-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-lib: disable trace when test is not verboseJeff King2015-08-071-2/+6
| * | | | | | | | | | | | | test-lib: turn off "-x" tracing during chain-lint checkJeff King2015-08-071-0/+5
* | | | | | | | | | | | | | Merge branch 'ps/t1509-chroot-test-fixup'Junio C Hamano2015-08-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: fix cleanup after tests in t1509-root-worktreePatrick Steinhardt2015-08-051-1/+1