aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
* | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: mark usage error strings for translationJeff King2016-12-15
| * | | | | | | | | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-14
| * | | | | | | | | completion: add --continue option for mergeChris Packham2016-12-14
| * | | | | | | | | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | i18n: difftool: mark warnings for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: send-email: mark composing message for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: send-email: mark string with interpolation for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: send-email: mark warnings and errors for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: send-email: mark strings for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark status words for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: remove %patch_modes entriesVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark edit_hunk_manually message for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: i18n of help_patch_cmdVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-14
| * | | | | | | | | i18n: clean.c: match string with git-add--interactive.perlVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark strings with interpolation for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark simple here-documents for translationVasco Almeida2016-12-14
| * | | | | | | | | i18n: add--interactive: mark strings for translationVasco Almeida2016-12-14
| * | | | | | | | | Git.pm: add subroutines for commenting linesVasco Almeida2016-12-14
* | | | | | | | | | Merge branch 'sb/submodule-config-cleanup'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ \