delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'jk/git-connection-deadlock-fix'	Junio C Hamano	2011-05-19	4	-14/+67
\|\
\| *	test core.gitproxy configuration	Jeff King	2011-05-18	1	-0/+43
\| *	send-pack: avoid deadlock on git:// push with failed pack-objects	Jeff King	2011-05-16	1	-0/+2
\| *	connect: let callers know if connection is a socket	Jeff King	2011-05-16	2	-1/+7
\| *	connect: treat generic proxy processes like ssh processes	Jeff King	2011-05-16	1	-13/+15
* \|	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'	Junio C Hamano	2011-05-19	1	-2/+2
\|\ \
\| * \	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...	Junio C Hamano	2011-05-16	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	sideband_demux(): fix decl-after-stmt	Junio C Hamano	2011-05-16	1	-2/+2
* \| \|	Merge branch 'jk/cherry-pick-root-with-resolve'	Junio C Hamano	2011-05-19	3	-7/+36
\|\ \ \
\| * \| \|	t3503: test cherry picking and reverting root commits	Jeff King	2011-05-16	1	-2/+25
\| * \| \|	revert: allow reverting a root commit	Jeff King	2011-05-16	1	-3/+1
\| * \| \|	cherry-pick: handle root commits with external strategies	Jeff King	2011-05-16	1	-2/+10
* \| \| \|	Merge branch 'jc/maint-pathspec-stdin-and-cmdline'	Junio C Hamano	2011-05-19	2	-52/+45
\|\ \ \ \
\| * \ \ \	Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'	Junio C Hamano	2011-05-11	2	-52/+45
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'	Junio C Hamano	2011-05-11	2	-52/+45
\| \| \|\ \ \ \
\| \| \| * \| \| \|	setup_revisions(): take pathspec from command line and --stdin correctly	Junio C Hamano	2011-05-11	2	-52/+45
* \| \| \| \| \| \|	Merge 1.7.5.2 in	Junio C Hamano	2011-05-19	2	-1/+513
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Git 1.7.5.2v1.7.5.2	Junio C Hamano	2011-05-19	2	-2/+3
\| * \| \| \| \| \| \|	provide a copy of the LGPLv2.1	Jonathan Nieder	2011-05-19	1	-0/+511
* \| \| \| \| \| \| \|	Revert "Merge branch 'en/merge-recursive'"	Junio C Hamano	2011-05-19	2	-81/+6
* \| \| \| \| \| \| \|	Makefile: sort TEST_PROGRAMS list	Jeff King	2011-05-19	1	-2/+2
* \| \| \| \| \| \| \|	Update release notes to 1.7.6	Junio C Hamano	2011-05-16	1	-13/+20
* \| \| \| \| \| \| \|	Merge branch 'jc/convert'	Junio C Hamano	2011-05-16	4	-90/+84
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	convert: make it harder to screw up adding a conversion attribute	Junio C Hamano	2011-05-09	1	-41/+38
\| * \| \| \| \| \| \| \|	convert: make it safer to add conversion attributes	Junio C Hamano	2011-05-09	1	-26/+22
\| * \| \| \| \| \| \| \|	convert: give saner names to crlf/eol variables, types and functions	Junio C Hamano	2011-05-09	1	-30/+31
\| * \| \| \| \| \| \| \|	convert: rename the "eol" global variable to "core_eol"	Junio C Hamano	2011-05-09	4	-10/+10
* \| \| \| \| \| \| \| \|	Merge branch 'ci/commit--interactive-atomic'	Junio C Hamano	2011-05-16	6	-31/+75
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Test atomic git-commit --interactive	Conrad Irwin	2011-05-10	1	-0/+10
\| * \| \| \| \| \| \| \| \|	Add commit to list of config.singlekey commands	Conrad Irwin	2011-05-09	1	-3/+4
\| * \| \| \| \| \| \| \| \|	Add support for -p/--patch to git-commit	Conrad Irwin	2011-05-09	4	-16/+27
\| * \| \| \| \| \| \| \| \|	Allow git commit --interactive with paths	Conrad Irwin	2011-05-09	2	-4/+3
\| * \| \| \| \| \| \| \| \|	t7501.8: feed a meaningful command	Jeff King	2011-05-09	1	-4/+6
\| * \| \| \| \| \| \| \| \|	Use a temporary index for git commit --interactive	Conrad Irwin	2011-05-08	2	-9/+30
* \| \| \| \| \| \| \| \| \|	Merge branch 'sg/completion-updates'	Junio C Hamano	2011-05-16	1	-4/+16
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'fc/completion-zsh' into sg/completion-updates	Junio C Hamano	2011-05-10	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	git-completion: fix regression in zsh support	Felipe Contreras	2011-05-10	1	-0/+8
\| * \| \| \| \| \| \| \| \| \| \|	Revert "completion: don't declare 'local words' to make zsh happy"	Junio C Hamano	2011-05-10	1	-6/+2
\| * \| \| \| \| \| \| \| \| \| \|	completion: move private shopt shim for zsh to __git_ namespace	Jonathan Nieder	2011-05-08	1	-4/+8
\| * \| \| \| \| \| \| \| \| \| \|	completion: don't declare 'local words' to make zsh happy	SZEDER Gábor	2011-04-28	1	-2/+6
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'kk/maint-prefix-in-config-mak'	Junio C Hamano	2011-05-16	1	-9/+9
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Honor $(prefix) set in config.mak* when defining ETC_GIT*	Johannes Sixt	2011-05-09	1	-9/+9
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...	Junio C Hamano	2011-05-09	1	-10/+9
\| * \| \| \| \| \| \| \| \| \| \| \|	Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir	Kacper Kornet	2011-04-28	1	-9/+10
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg/merge-ff-config'	Junio C Hamano	2011-05-16	3	-6/+77
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	tests: check git does not barf on merge.ff values for future versions of git	Jonathan Nieder	2011-05-06	1	-2/+14
\| * \| \| \| \| \| \| \| \| \| \| \| \|	merge: introduce merge.ff configuration variable	Junio C Hamano	2011-05-06	3	-2/+60
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config	Junio C Hamano	2011-05-06	2	-15/+59
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2011-05-16	2	-2/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update draft release notes to 1.7.5.2	Junio C Hamano	2011-05-16	1	-0/+15