summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetool: fix running in subdir when rerere enabledrh/mergetool-regression-fixRichard Hansen2017-01-102-3/+21
* mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-101-2/+2
* t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-101-1/+20
* t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-101-18/+19
* t7610: don't assume the checked-out commitRichard Hansen2017-01-101-6/+6
* t7610: always work on a test-specific branchRichard Hansen2017-01-101-2/+8
* t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-101-2/+0
* t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-101-0/+8
* t7610: don't rely on state from previous testRichard Hansen2017-01-101-0/+6
* t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-101-34/+37
* t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-101-30/+35
* t7610: update branch names to match test numberRichard Hansen2017-01-101-41/+41
* rev-parse doc: pass "--" to rev-parse in the --prefix exampleRichard Hansen2017-01-101-1/+2
* .mailmap: record canonical email for Richard HansenRichard Hansen2017-01-101-0/+2
* Fourth batch for 2.12Junio C Hamano2016-12-271-0/+42
* Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-271-1/+1
|\
| * lockfile: move REPORT_ON_ERROR bit elsewherejc/lock-report-on-errorJunio C Hamano2016-12-271-1/+1
* | Merge branch 'js/mingw-isatty'Junio C Hamano2016-12-271-114/+84
|\ \
| * | mingw: replace isatty() hackJeff Hostetler2016-12-221-107/+69
| * | mingw: fix colourization on Cygwin pseudo terminalsAlan Davies2016-12-221-2/+6
| * | mingw: adjust is_console() to work with stdinJohannes Schindelin2016-12-221-1/+5
* | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-272-14/+14
|\ \ \
| * | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfsLars Schneider2016-12-202-14/+14
* | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-12-272-3/+4
|\ \ \ \
| * | | | i18n: fix misconversion in shell scriptsva/i18n-even-moreJunio C Hamano2016-12-202-3/+4
* | | | | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-274-3/+36
|\ \ \ \ \
| * | | | | t4201: make tests work with and without the MINGW prerequistelt/shortlog-by-committerJunio C Hamano2016-12-201-1/+7
| * | | | | shortlog: test and document --committer optionJeff King2016-12-162-0/+17
| * | | | | shortlog: group by committer informationLinus Torvalds2016-12-152-3/+13
* | | | | | Merge branch 'mk/mingw-winansi-ttyname-termination-fix'Junio C Hamano2016-12-271-1/+1
|\ \ \ \ \ \
| * | | | | | mingw: consider that UNICODE_STRING::Length counts bytesmk/mingw-winansi-ttyname-termination-fixMax Kirillov2016-12-201-1/+1
* | | | | | | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-272-3/+23
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fixGeorge Vanburgh2016-12-192-3/+23
* | | | | | | | Merge branch 'jk/difftool-in-subdir'Junio C Hamano2016-12-271-24/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: rename variables for consistencyjk/difftool-in-subdirDavid Aguilar2016-12-111-14/+14
| * | | | | | | | difftool: chdir as early as possibleDavid Aguilar2016-12-111-12/+14
| * | | | | | | | difftool: sanitize $workdir as early as possibleDavid Aguilar2016-12-111-3/+2
| * | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-112-3/+45
* | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2016-12-272-6/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-182-6/+63
* | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-274-29/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0021: fix flaky testls/filter-processLars Schneider2016-12-181-16/+1
| * | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-064-15/+25
* | | | | | | | | | | Merge branch 'bw/transport-protocol-policy'Junio C Hamano2016-12-2712-85/+362
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: respect protocol.*.allow=user for http-alternatesbw/transport-protocol-policyJeff King2016-12-152-11/+51
| * | | | | | | | | | | transport: add from_user parameter to is_transport_allowedBrandon Williams2016-12-154-13/+29
| * | | | | | | | | | | http: create function to get curl allowed protocolsBrandon Williams2016-12-151-11/+20
| * | | | | | | | | | | transport: add protocol policy config optionBrandon Williams2016-12-157-39/+264
| * | | | | | | | | | | http: always warn if libcurl version is too oldBrandon Williams2016-12-153-14/+2
| * | | | | | | | | | | lib-proto-disable: variable name fixBrandon Williams2016-12-141-6/+6
View Lorry Controller Status