org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'	Junio C Hamano	2017-01-10
\|\
\| *	fetch: do not redundantly calculate tag refmap	Jonathan Tan	2016-11-11
* \|	Merge branch 'jc/latin-1'	Junio C Hamano	2017-01-10
\|\ \
\| * \|	utf8: accept "latin-1" as ISO-8859-1	Junio C Hamano	2016-09-26
\| * \|	utf8: refactor code to decide fallback encoding	Junio C Hamano	2016-09-26
\| \|/
* \|	Fourth batch for 2.12	Junio C Hamano	2016-12-27
* \|	Merge branch 'jc/lock-report-on-error'	Junio C Hamano	2016-12-27
\|\ \
\| * \|	lockfile: move REPORT_ON_ERROR bit elsewhere	Junio C Hamano	2016-12-27
* \| \|	Merge branch 'js/mingw-isatty'	Junio C Hamano	2016-12-27
\|\ \ \
\| * \| \|	mingw: replace isatty() hack	Jeff Hostetler	2016-12-22
\| * \| \|	mingw: fix colourization on Cygwin pseudo terminals	Alan Davies	2016-12-22
\| * \| \|	mingw: adjust is_console() to work with stdin	Johannes Schindelin	2016-12-22
* \| \| \|	Merge branch 'ls/p4-lfs'	Junio C Hamano	2016-12-27
\|\ \ \ \
\| * \| \| \|	git-p4: add diff/merge properties to .gitattributes for GitLFS files	Lars Schneider	2016-12-20
* \| \| \| \|	Merge branch 'va/i18n-even-more'	Junio C Hamano	2016-12-27
\|\ \ \ \ \
\| * \| \| \| \|	i18n: fix misconversion in shell scripts	Junio C Hamano	2016-12-20
* \| \| \| \| \|	Merge branch 'lt/shortlog-by-committer'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t4201: make tests work with and without the MINGW prerequiste	Junio C Hamano	2016-12-20
\| * \| \| \| \| \|	shortlog: test and document --committer option	Jeff King	2016-12-16
\| * \| \| \| \| \|	shortlog: group by committer information	Linus Torvalds	2016-12-15
* \| \| \| \| \| \|	Merge branch 'mk/mingw-winansi-ttyname-termination-fix'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	mingw: consider that UNICODE_STRING::Length counts bytes	Max Kirillov	2016-12-20
* \| \| \| \| \| \| \|	Merge branch 'gv/p4-multi-path-commit-fix'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	git-p4: fix multi-path changelist empty commits	George Vanburgh	2016-12-19
* \| \| \| \| \| \| \| \|	Merge branch 'jk/difftool-in-subdir'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	difftool: rename variables for consistency	David Aguilar	2016-12-11
\| * \| \| \| \| \| \| \| \|	difftool: chdir as early as possible	David Aguilar	2016-12-11
\| * \| \| \| \| \| \| \| \|	difftool: sanitize $workdir as early as possible	David Aguilar	2016-12-11
\| * \| \| \| \| \| \| \| \|	difftool: fix dir-diff index creation when in a subdirectory	David Aguilar	2016-12-11
* \| \| \| \| \| \| \| \| \|	Merge branch 'ld/p4-compare-dir-vs-symlink'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	git-p4: avoid crash adding symlinked directory	Luke Diamand	2016-12-18
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ls/filter-process'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	t0021: fix flaky test	Lars Schneider	2016-12-18
\| * \| \| \| \| \| \| \| \| \| \|	docs: warn about possible '=' in clean/smudge filter process values	Lars Schneider	2016-12-06
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bw/transport-protocol-policy'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	http: respect protocol.*.allow=user for http-alternates	Jeff King	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \|	transport: add from_user parameter to is_transport_allowed	Brandon Williams	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \|	http: create function to get curl allowed protocols	Brandon Williams	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \|	transport: add protocol policy config option	Brandon Williams	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \|	http: always warn if libcurl version is too old	Brandon Williams	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \|	lib-proto-disable: variable name fix	Brandon Williams	2016-12-14
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cp/merge-continue'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	merge: mark usage error strings for translation	Jeff King	2016-12-15
\| * \| \| \| \| \| \| \| \| \| \| \| \|	merge: ensure '--abort' option takes no arguments	Chris Packham	2016-12-14
\| * \| \| \| \| \| \| \| \| \| \| \| \|	completion: add --continue option for merge	Chris Packham	2016-12-14
\| * \| \| \| \| \| \| \| \| \| \| \| \|	merge: add '--continue' option as a synonym for 'git commit'	Chris Packham	2016-12-14
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'va/i18n-perl-scripts'	Junio C Hamano	2016-12-27
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	i18n: difftool: mark warnings for translation	Vasco Almeida	2016-12-14
\| * \| \| \| \| \| \| \| \| \| \| \| \|	i18n: send-email: mark composing message for translation	Vasco Almeida	2016-12-14
\| * \| \| \| \| \| \| \| \| \| \| \| \|	i18n: send-email: mark string with interpolation for translation	Vasco Almeida	2016-12-14