Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | submodule.c: use GIT_DIR_ENVIRONMENT consistentlysb/submodule-cleanup-export-git-dir-env | Stefan Beller | 2017-01-07 | 1 | -1/+2 |
* | Fourth batch for 2.12 | Junio C Hamano | 2016-12-27 | 1 | -0/+42 |
* | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
|\ | |||||
| * | lockfile: move REPORT_ON_ERROR bit elsewherejc/lock-report-on-error | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
* | | Merge branch 'js/mingw-isatty' | Junio C Hamano | 2016-12-27 | 1 | -114/+84 |
|\ \ | |||||
| * | | mingw: replace isatty() hack | Jeff Hostetler | 2016-12-22 | 1 | -107/+69 |
| * | | mingw: fix colourization on Cygwin pseudo terminals | Alan Davies | 2016-12-22 | 1 | -2/+6 |
| * | | mingw: adjust is_console() to work with stdin | Johannes Schindelin | 2016-12-22 | 1 | -1/+5 |
* | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 | 2 | -14/+14 |
|\ \ \ | |||||
| * | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfs | Lars Schneider | 2016-12-20 | 2 | -14/+14 |
* | | | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-12-27 | 2 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | i18n: fix misconversion in shell scriptsva/i18n-even-more | Junio C Hamano | 2016-12-20 | 2 | -3/+4 |
* | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 | 4 | -3/+36 |
|\ \ \ \ \ | |||||
| * | | | | | t4201: make tests work with and without the MINGW prerequistelt/shortlog-by-committer | Junio C Hamano | 2016-12-20 | 1 | -1/+7 |
| * | | | | | shortlog: test and document --committer option | Jeff King | 2016-12-16 | 2 | -0/+17 |
| * | | | | | shortlog: group by committer information | Linus Torvalds | 2016-12-15 | 2 | -3/+13 |
* | | | | | | Merge branch 'mk/mingw-winansi-ttyname-termination-fix' | Junio C Hamano | 2016-12-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mingw: consider that UNICODE_STRING::Length counts bytesmk/mingw-winansi-ttyname-termination-fix | Max Kirillov | 2016-12-20 | 1 | -1/+1 |
* | | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' | Junio C Hamano | 2016-12-27 | 2 | -3/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fix | George Vanburgh | 2016-12-19 | 2 | -3/+23 |
* | | | | | | | | Merge branch 'jk/difftool-in-subdir' | Junio C Hamano | 2016-12-27 | 1 | -24/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool: rename variables for consistencyjk/difftool-in-subdir | David Aguilar | 2016-12-11 | 1 | -14/+14 |
| * | | | | | | | | difftool: chdir as early as possible | David Aguilar | 2016-12-11 | 1 | -12/+14 |
| * | | | | | | | | difftool: sanitize $workdir as early as possible | David Aguilar | 2016-12-11 | 1 | -3/+2 |
| * | | | | | | | | difftool: fix dir-diff index creation when in a subdirectory | David Aguilar | 2016-12-11 | 2 | -3/+45 |
* | | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' | Junio C Hamano | 2016-12-27 | 2 | -6/+63 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlink | Luke Diamand | 2016-12-18 | 2 | -6/+63 |
* | | | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 | 4 | -29/+24 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0021: fix flaky testls/filter-process | Lars Schneider | 2016-12-18 | 1 | -16/+1 |
| * | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 | 4 | -15/+25 |
* | | | | | | | | | | | Merge branch 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 | 12 | -85/+362 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | http: respect protocol.*.allow=user for http-alternatesbw/transport-protocol-policy | Jeff King | 2016-12-15 | 2 | -11/+51 |
| * | | | | | | | | | | | transport: add from_user parameter to is_transport_allowed | Brandon Williams | 2016-12-15 | 4 | -13/+29 |
| * | | | | | | | | | | | http: create function to get curl allowed protocols | Brandon Williams | 2016-12-15 | 1 | -11/+20 |
| * | | | | | | | | | | | transport: add protocol policy config option | Brandon Williams | 2016-12-15 | 7 | -39/+264 |
| * | | | | | | | | | | | http: always warn if libcurl version is too old | Brandon Williams | 2016-12-15 | 3 | -14/+2 |
| * | | | | | | | | | | | lib-proto-disable: variable name fix | Brandon Williams | 2016-12-14 | 1 | -6/+6 |
* | | | | | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 4 | -1/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | merge: mark usage error strings for translationcp/merge-continue | Jeff King | 2016-12-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | merge: ensure '--abort' option takes no arguments | Chris Packham | 2016-12-14 | 2 | -0/+6 |
| * | | | | | | | | | | | | completion: add --continue option for merge | Chris Packham | 2016-12-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 2016-12-14 | 3 | -0/+38 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'va/i18n-perl-scripts' | Junio C Hamano | 2016-12-27 | 8 | -218/+408 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | i18n: difftool: mark warnings for translation | Vasco Almeida | 2016-12-14 | 1 | -10/+12 |
| * | | | | | | | | | | | | i18n: send-email: mark composing message for translation | Vasco Almeida | 2016-12-14 | 1 | -7/+9 |
| * | | | | | | | | | | | | i18n: send-email: mark string with interpolation for translation | Vasco Almeida | 2016-12-14 | 1 | -40/+47 |
| * | | | | | | | | | | | | i18n: send-email: mark warnings and errors for translation | Vasco Almeida | 2016-12-14 | 1 | -17/+17 |
| * | | | | | | | | | | | | i18n: send-email: mark strings for translation | Vasco Almeida | 2016-12-14 | 1 | -22/+32 |
| * | | | | | | | | | | | | i18n: add--interactive: mark status words for translation | Vasco Almeida | 2016-12-14 | 1 | -6/+6 |
| * | | | | | | | | | | | | i18n: add--interactive: remove %patch_modes entries | Vasco Almeida | 2016-12-14 | 1 | -21/+0 |