aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* mergetool: fix running in subdir when rerere enabledRichard Hansen2017-01-10
* mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-10
* t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-10
* t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-10
* t7610: don't assume the checked-out commitRichard Hansen2017-01-10
* t7610: always work on a test-specific branchRichard Hansen2017-01-10
* t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-10
* t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-10
* t7610: don't rely on state from previous testRichard Hansen2017-01-10
* t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-10
* t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-10
* t7610: update branch names to match test numberRichard Hansen2017-01-10
* rev-parse doc: pass "--" to rev-parse in the --prefix exampleRichard Hansen2017-01-10
* .mailmap: record canonical email for Richard HansenRichard Hansen2017-01-10
* Fourth batch for 2.12Junio C Hamano2016-12-27
* Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-27
|\
| * lockfile: move REPORT_ON_ERROR bit elsewhereJunio C Hamano2016-12-27
* | Merge branch 'js/mingw-isatty'Junio C Hamano2016-12-27
|\ \
| * | mingw: replace isatty() hackJeff Hostetler2016-12-22
| * | mingw: fix colourization on Cygwin pseudo terminalsAlan Davies2016-12-22
| * | mingw: adjust is_console() to work with stdinJohannes Schindelin2016-12-22
* | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-27
|\ \ \
| * | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider2016-12-20
* | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-12-27
|\ \ \ \
| * | | | i18n: fix misconversion in shell scriptsJunio C Hamano2016-12-20
* | | | | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-27
|\ \ \ \ \
| * | | | | t4201: make tests work with and without the MINGW prerequisteJunio C Hamano2016-12-20
| * | | | | shortlog: test and document --committer optionJeff King2016-12-16
| * | | | | shortlog: group by committer informationLinus Torvalds2016-12-15
* | | | | | Merge branch 'mk/mingw-winansi-ttyname-termination-fix'Junio C Hamano2016-12-27
|\ \ \ \ \ \
| * | | | | | mingw: consider that UNICODE_STRING::Length counts bytesMax Kirillov2016-12-20
* | | | | | | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix multi-path changelist empty commitsGeorge Vanburgh2016-12-19
* | | | | | | | Merge branch 'jk/difftool-in-subdir'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: rename variables for consistencyDavid Aguilar2016-12-11
| * | | | | | | | difftool: chdir as early as possibleDavid Aguilar2016-12-11
| * | | | | | | | difftool: sanitize $workdir as early as possibleDavid Aguilar2016-12-11
| * | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-11
* | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: avoid crash adding symlinked directoryLuke Diamand2016-12-18
* | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0021: fix flaky testLars Schneider2016-12-18
| * | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-06
* | | | | | | | | | | Merge branch 'bw/transport-protocol-policy'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: respect protocol.*.allow=user for http-alternatesJeff King2016-12-15
| * | | | | | | | | | | transport: add from_user parameter to is_transport_allowedBrandon Williams2016-12-15
| * | | | | | | | | | | http: create function to get curl allowed protocolsBrandon Williams2016-12-15
| * | | | | | | | | | | transport: add protocol policy config optionBrandon Williams2016-12-15
| * | | | | | | | | | | http: always warn if libcurl version is too oldBrandon Williams2016-12-15
| * | | | | | | | | | | lib-proto-disable: variable name fixBrandon Williams2016-12-14