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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/color-diff-plain-is-context' into maint	Junio C Hamano	2015-06-25
\|\
\| *	diff: accept color.diff.context as a synonym for "plain"	Jeff King	2015-05-27
* \|	Merge branch 'pt/pull-ff-vs-merge-ff' into maint	Junio C Hamano	2015-06-05
\|\ \
\| * \|	pull: make pull.ff=true override merge.ff	Paul Tan	2015-05-18
* \| \|	Merge branch 'jk/asciidoc-markup-fix' into maint	Junio C Hamano	2015-06-05
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	doc: convert \--option to --option	Jeff King	2015-05-12
\| * \|	Merge branch 'mg/doc-status-color-slot' into maint	Junio C Hamano	2015-03-23
\| \|\ \
\| * \ \	Merge branch 'jc/decorate-leaky-separator-color' into maint	Junio C Hamano	2015-03-23
\| \|\ \ \
\| * \ \ \	Merge branch 'ms/submodule-update-config-doc' into maint	Junio C Hamano	2015-03-13
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'mm/am-c-doc' into maint	Junio C Hamano	2015-03-06
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jc/conf-var-doc' into maint	Junio C Hamano	2015-03-05
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'jk/push-config'	Junio C Hamano	2015-03-23
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	push: allow --follow-tags to be set by config push.followTags	Dave Olszewski	2015-03-14
* \| \| \| \| \| \| \| \|	Merge branch 'nd/config-doc-camelCase'	Junio C Hamano	2015-03-23
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	*config.txt: stick to camelCase naming convention	Nguyễn Thái Ngọc Duy	2015-03-13
* \| \| \| \| \| \| \| \| \|	Merge branch 'jc/decorate-leaky-separator-color'	Junio C Hamano	2015-03-20
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	log --decorate: do not leak "commit" color into the next item	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: simplify boolean description in the syntax section	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: describe 'color' value type in the "Values" section	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: have a separate "Values" section	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: describe the structure first and then meaning	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: explain multi-valued variables once	Junio C Hamano	2015-03-04
\| * \| \| \| \| \| \| \| \|	Documentation/config.txt: avoid unnecessary negation	Junio C Hamano	2015-03-04
* \| \| \| \| \| \| \| \| \|	Merge branch 'nd/versioncmp-prereleases'	Junio C Hamano	2015-03-20
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	config.txt: update versioncmp.prereleaseSuffix	Nguyễn Thái Ngọc Duy	2015-03-10
\| * \| \| \| \| \| \| \| \| \|	versionsort: support reorder prerelease suffixes	Nguyễn Thái Ngọc Duy	2015-02-27
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'jk/colors-fix' into maint	Junio C Hamano	2014-12-22
\| \|\ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \	Merge branch 'mg/doc-status-color-slot'	Junio C Hamano	2015-03-17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	config,completion: add color.status.unmerged	Michael J Gruber	2015-03-10
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ms/submodule-update-config-doc'	Junio C Hamano	2015-03-06
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	submodule: improve documentation of update subcommand	Michal Sojka	2015-03-02
* \| \| \| \| \| \| \| \|	Merge branch 'mm/am-c-doc'	Junio C Hamano	2015-03-05
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Documentation/config.txt: document mailinfo.scissors	Matthieu Moy	2015-02-20
* \| \| \| \| \| \| \| \|	Merge branch 'jc/conf-var-doc'	Junio C Hamano	2015-02-22
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	config.txt: mark deprecated variables more prominently	Junio C Hamano	2015-01-28
\| * \| \| \| \| \| \|	config.txt: clarify that add.ignore-errors is deprecated	Junio C Hamano	2015-01-28
* \| \| \| \| \| \| \|	Merge branch 'jc/push-to-checkout'	Junio C Hamano	2015-02-11
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	receive-pack: support push-to-checkout hook	Junio C Hamano	2015-01-08
* \| \| \| \| \| \| \| \|	Merge branch 'sb/atomic-push'	Junio C Hamano	2015-02-11
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Document receive.advertiseatomic	Stefan Beller	2015-01-14
* \| \| \| \| \| \| \| \|	Merge branch 'po/doc-core-ignorestat'	Junio C Hamano	2015-01-14
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	doc: core.ignoreStat update, and clarify the --assume-unchanged effect	Philip Oakley	2015-01-12
\| * \| \| \| \| \| \| \| \|	doc: core.ignoreStat clarify the --assume-unchanged effect	Philip Oakley	2014-12-12
* \| \| \| \| \| \| \| \| \|	Merge branch 'lh/send-email-hide-x-mailer'	Junio C Hamano	2015-01-07
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	send-email: add --[no-]xmailer option	Luis Henriques	2014-12-15
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/colors'	Junio C Hamano	2014-12-22
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	parse_color: recognize "no$foo" to clear the $foo attribute	Jeff King	2014-11-20
\| * \| \| \| \| \| \| \| \| \| \|	parse_color: support 24-bit RGB values	Jeff King	2014-11-20
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'js/push-to-deploy'	Junio C Hamano	2014-12-22
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	receive-pack: add another option for receive.denyCurrentBranch	Johannes Schindelin	2014-11-30