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

	Commit message (Expand)	Author	Age
*	Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint	Junio C Hamano	2016-04-25
\|\
\| *	Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint	Jiang Xin	2016-04-24
\| \|\
\| \| *	Merge pull request #9 from vascool/fr	Jean-Noël Avila	2016-03-25
\| \| \|\
\| \| \| *	l10n: fr: don't translate "merge" as a parameter	Vasco Almeida	2016-03-25
\| \| \| *	l10n: fr: change "id de clé" to match "id-clé"	Vasco Almeida	2016-03-25
\| \| \| *	l10n: fr: fix wrongly translated option name	Vasco Almeida	2016-03-25
\| \| \| *	l10n: fr: fix transcation of "dir"	Vasco Almeida	2016-03-25
\| \| \|/
* \| \|	Prepare for 2.8.2	Junio C Hamano	2016-04-14
* \| \|	Merge branch 'jv/merge-nothing-into-void' into maint	Junio C Hamano	2016-04-14
\|\ \ \
\| * \| \|	merge: fix NULL pointer dereference when merging nothing into void	Junio C Hamano	2016-03-23
* \| \| \|	Merge branch 'ss/commit-squash-msg' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \
\| * \| \| \|	commit: do not lose SQUASH_MSG contents	Sven Strickroth	2016-03-21
* \| \| \| \|	Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \
\| * \| \| \| \|	send-email: ignore trailing whitespace in mailrc alias file	Jeff King	2016-03-18
* \| \| \| \| \|	Merge branch 'da/mergetool-delete-delete-conflict' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	mergetool: honor tempfile configuration when resolving delete conflicts	David Aguilar	2016-03-10
\| * \| \| \| \| \|	mergetool: support delete/delete conflicts	David Aguilar	2016-03-10
* \| \| \| \| \| \|	Merge branch 'jk/startup-info' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	use setup_git_directory() in test-* programs	Jeff King	2016-03-07
\| * \| \| \| \| \| \|	grep: turn off gitlink detection for --no-index	Jeff King	2016-03-07
\| * \| \| \| \| \| \|	mailmap: do not resolve blobs in a non-repository	Jeff King	2016-03-06
\| * \| \| \| \| \| \|	remote: don't resolve HEAD in non-repository	Jeff King	2016-03-06
\| * \| \| \| \| \| \|	setup: set startup_info->have_repository more reliably	Jeff King	2016-03-06
\| * \| \| \| \| \| \|	setup: make startup_info available everywhere	Jeff King	2016-03-06
* \| \| \| \| \| \| \|	Merge branch 'jk/getwholeline-getdelim-empty' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	strbuf_getwholeline: NUL-terminate getdelim buffer on error	Jeff King	2016-03-05
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	xdiff/xprepare: fix a memory leak	Ramsay Jones	2016-03-04
\| * \| \| \| \| \| \| \|	xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits	Ramsay Jones	2016-03-04
* \| \| \| \| \| \| \| \|	Merge branch 'gf/fetch-pack-direct-object-fetch' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fetch-pack: update the documentation for "<refs>..." arguments	Gabriel Souza Franco	2016-03-05
\| * \| \| \| \| \| \| \| \|	fetch-pack: fix object_id of exact sha1	Gabriel Souza Franco	2016-03-01
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/rev-parse-local-env-vars' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	rev-parse: let some options run outside repository	Jeff King	2016-02-29
\| * \| \| \| \| \| \| \| \| \|	t1515: add tests for rev-parse out-of-repo helpers	Jeff King	2016-02-28
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/config-get-urlmatch' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Documentation/git-config: fix --get-all description	John Keeping	2016-02-28
\| * \| \| \| \| \| \| \| \| \|	Documentation/git-config: use bulleted list for exit codes	John Keeping	2016-02-28
\| * \| \| \| \| \| \| \| \| \|	config: fail if --get-urlmatch finds no value	John Keeping	2016-02-28
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'pb/t7502-drop-dup' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	t/t7502 : drop duplicate test	Pranit Bauva	2016-03-11
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/test-httpd-config-nosystem' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env	Jeff King	2016-03-18
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sb/clone-t57-t56' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	clone tests: rename t57* => t56*	Stefan Beller	2016-03-16
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/credential-cache-comment-exit' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	credential-cache--daemon: clarify "exit" action semantics	Jeff King	2016-03-18
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/index-pack' into maint	Junio C Hamano	2016-04-14
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	index-pack: add a helper function to derive .idx/.keep filename	Junio C Hamano	2016-03-03
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-index-pack-keep' into jc/index-pack	Junio C Hamano	2016-03-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|