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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/config-no-ungetc-eof' into maint	Junio C Hamano	2015-03-05
\|\
\| *	config_buf_ungetc: warn when pushing back a random character	Jeff King	2015-02-05
\| *	config: do not ungetc EOF	Jeff King	2015-02-05
* \|	Merge branch 'jk/blame-commit-label' into maint	Junio C Hamano	2015-02-24
\|\ \
\| * \|	use xstrdup_or_null to replace ternary conditionals	Jeff King	2015-01-13
* \| \|	Sync with v2.2.1	Junio C Hamano	2014-12-18
\|\ \ \
\| * \ \	Sync with v2.1.4	Junio C Hamano	2014-12-17
\| \|\ \ \
\| \| * \ \	Sync with v2.0.5	Junio C Hamano	2014-12-17
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Sync with v1.9.5	Junio C Hamano	2014-12-17
\| \| \| \|\ \
\| \| \| \| * \	Sync with v1.8.5.6	Junio C Hamano	2014-12-17
\| \| \| \| \|\ \
\| \| \| \| \| * \|	read-cache: optionally disallow NTFS .git variants	Johannes Schindelin	2014-12-17
\| \| \| \| \| * \|	read-cache: optionally disallow HFS+ .git variants	Jeff King	2014-12-17
* \| \| \| \| \| \|	Merge branch 'rs/maint-config-use-labs'	Junio C Hamano	2014-12-05
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	use labs() for variables of type long instead of abs()	René Scharfe	2014-11-17
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'ta/config-add-to-empty-or-true-fix' into maint	Junio C Hamano	2014-09-29
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jk/command-line-config-empty-string' into maint	Junio C Hamano	2014-09-19
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'mh/lockfile'	Junio C Hamano	2014-10-14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	lockfile.h: extract new header file for the functions in lockfile.c	Michael Haggerty	2014-10-01
\| * \| \| \| \| \| \|	lockfile: change lock_file::filename into a strbuf	Michael Haggerty	2014-10-01
\| * \| \| \| \| \| \|	git_config_set_multivar_in_file(): avoid call to rollback_lock_file()	Michael Haggerty	2014-10-01
* \| \| \| \| \| \| \|	Merge branch 'sp/stream-clean-filter'	Junio C Hamano	2014-10-08
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	config.c: add git_env_ulong() to parse environment variable	Steffen Prohaska	2014-08-28
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ta/config-add-to-empty-or-true-fix'	Junio C Hamano	2014-09-19
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	config: avoid a funny sentinel value "a^"	Jeff King	2014-09-11
\| * \| \| \| \| \|	make config --add behave correctly for empty and NULL values	Tanay Abhra	2014-08-18
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'bg/xcalloc-nmemb-then-size' into maint	Junio C Hamano	2014-07-22
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'ow/config-mailmap-pathname' into maint	Junio C Hamano	2014-06-25
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'rs/simplify-config-include'	Junio C Hamano	2014-09-19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	config: simplify git_config_include()	René Scharfe	2014-09-02
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ta/config-set-1'	Junio C Hamano	2014-09-11
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rewrite git_config() to use the config-set API	Tanay Abhra	2014-08-07
\| * \| \| \| \| \| \| \|	config: add `git_die_config()` to the config-set API	Tanay Abhra	2014-08-07
\| * \| \| \| \| \| \| \|	change `git_config()` return value to void	Tanay Abhra	2014-08-07
\| * \| \| \| \| \| \| \|	add line number and file name info to `config_set`	Tanay Abhra	2014-08-07
\| * \| \| \| \| \| \| \|	config.c: fix accuracy of line number in errors	Matthieu Moy	2014-08-07
\| * \| \| \| \| \| \| \|	config.c: mark error and warnings strings for translation	Matthieu Moy	2014-08-07
* \| \| \| \| \| \| \| \|	Merge branch 'jk/command-line-config-empty-string'	Junio C Hamano	2014-09-09
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	config: teach "git -c" to recognize an empty string	Junio C Hamano	2014-08-05
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ta/config-set'	Junio C Hamano	2014-09-02
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| / / / / / \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	add `config_set` API for caching config-like files	Tanay Abhra	2014-07-29
* \| \| \| \| \| \|	Merge branch 'jk/misc-fixes-maint'	Junio C Hamano	2014-07-28
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	fix memory leak parsing core.commentchar	Jeff King	2014-07-24
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'kb/avoid-fchmod-for-now'	Junio C Hamano	2014-07-21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	config: use chmod() instead of fchmod()	Karsten Blees	2014-07-16
* \| \| \| \| \| \|	refactor skip_prefix to return a boolean	Jeff King	2014-06-20
* \| \| \| \| \| \|	Merge branch 'ow/config-mailmap-pathname'	Junio C Hamano	2014-06-16
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	config: respect '~' and '~user' in mailmap.file	Øystein Walle	2014-05-27
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'bg/xcalloc-nmemb-then-size'	Junio C Hamano	2014-06-16
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	config.c: rearrange xcalloc arguments	Brian Gesiak	2014-05-27
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'jk/strbuf-tolower'	Junio C Hamano	2014-06-16
\|\ \ \ \ \