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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'	Junio C Hamano	2011-05-13	1	-0/+5
\|\
\| *	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...	Junio C Hamano	2011-05-05	1	-1/+2
\| \|\
\| \| *	send-pack: unbreak push over stateless rpc	Jeff King	2011-05-05	1	-1/+2
\| * \|	Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...	Junio C Hamano	2011-04-25	1	-0/+4
\| \|\ \ \| \| \|/
\| \| *	send-pack: avoid deadlock when pack-object dies early	Johannes Sixt	2011-04-25	1	-0/+4
* \| \|	Merge branch 'jh/dirstat-lines'	Junio C Hamano	2011-05-13	5	-32/+1219
\|\ \ \
\| * \| \|	Mark dirstat error messages for translation	Johan Herland	2011-04-29	2	-15/+15
\| * \| \|	Improve error handling when parsing dirstat parameters	Johan Herland	2011-04-29	2	-30/+78
\| * \| \|	New --dirstat=lines mode, doing dirstat analysis based on diffstat	Johan Herland	2011-04-29	5	-2/+176
\| * \| \|	Allow specifying --dirstat cut-off percentage as a floating point number	Johan Herland	2011-04-29	3	-11/+81
\| * \| \|	Add config variable for specifying default --dirstat behavior	Johan Herland	2011-04-29	4	-1/+119
\| * \| \|	Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file	Johan Herland	2011-04-29	3	-22/+214
\| * \| \|	Make --dirstat=0 output directories that contribute < 0.1% of changes	Johan Herland	2011-04-29	2	-4/+4
\| * \| \|	Add several testcases for --dirstat and friends	Johan Herland	2011-04-29	1	-0/+585
* \| \| \|	Merge branch 'jc/fix-add-u-unmerged'	Junio C Hamano	2011-05-13	2	-39/+30
\|\ \ \ \
\| * \| \| \|	Fix "add -u" that sometimes fails to resolve unmerged paths	Junio C Hamano	2011-04-23	2	-39/+30
* \| \| \| \|	Merge branch 'jn/setup-revisions-glob-and-friends-passthru'	Junio C Hamano	2011-05-13	2	-65/+122
\|\ \ \ \ \
\| * \| \| \| \|	revisions: allow --glob and friends in parse_options-enabled commands	Jonathan Nieder	2011-04-21	2	-1/+63
\| * \| \| \| \|	revisions: split out handle_revision_pseudo_opt function	Jonathan Nieder	2011-04-21	1	-64/+59
* \| \| \| \| \|	Merge branch 'cn/log-parse-opt'	Junio C Hamano	2011-05-13	1	-30/+44
\|\ \ \ \ \ \
\| * \| \| \| \| \|	log: convert to parse-options	Carlos Martín Nieto	2011-04-14	1	-30/+43
* \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2011-05-13	2	-2/+35
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Prepare for 1.7.5.2	Junio C Hamano	2011-05-13	2	-1/+34
\| * \| \| \| \| \| \|	Merge branch 'aw/maint-rebase-i-p-no-ff' into maint	Junio C Hamano	2011-05-13	2	-2/+32
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'js/blame-parsename' into maint	Junio C Hamano	2011-05-13	3	-3/+14
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint	Junio C Hamano	2011-05-13	1	-12/+41
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'cj/p4merge' into maint	Junio C Hamano	2011-05-13	1	-6/+3
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/merge-one-file-working-tree' into maint	Junio C Hamano	2011-05-13	2	-1/+106
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/fix-diff-files-unmerged' into maint	Junio C Hamano	2011-05-13	16	-36/+120
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mz/maint-rename-unmerged' into maint	Junio C Hamano	2011-05-13	2	-2/+67
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	t5400: Fix a couple of typos	Johan Herland	2011-05-13	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'nd/struct-pathspec'	Junio C Hamano	2011-05-12	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak t3102-ls-tree-wildcards to run on Windows	Johannes Sixt	2011-05-12	1	-7/+7
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update draft release notes to 1.7.6	Junio C Hamano	2011-05-11	1	-3/+18
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/gitweb-dependency'	Junio C Hamano	2011-05-11	1	-27/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitweb/gitweb.cgi and other legacy targets from main Makefile	Jakub Narebski	2011-05-08	1	-26/+0
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-instaweb: Simplify build dependency on gitweb	Jakub Narebski	2011-05-08	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-branch-mergeoptions'	Junio C Hamano	2011-05-11	2	-15/+58
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge: make branch.<name>.mergeoptions correctly override merge.<option>	Junio C Hamano	2011-05-06	2	-14/+57
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/maint-test-merge-verify-parents'	Junio C Hamano	2011-05-11	2	-99/+98
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests: teach verify_parents to check for extra parents	Jonathan Nieder	2011-05-06	1	-0/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests: eliminate unnecessary setup test assertions	Jonathan Nieder	2011-05-06	2	-99/+97
\| \| \|/ / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'vh/config-interactive-singlekey-doc'	Junio C Hamano	2011-05-11	5	-13/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-reset.txt: better docs for '--patch'	Valentin Haenel	2011-05-05	1	-3/+4
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-checkout.txt: better docs for '--patch'	Valentin Haenel	2011-05-05	1	-3/+4
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-stash.txt: better docs for '--patch'	Valentin Haenel	2011-05-05	1	-4/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-add.txt: document 'interactive.singlekey'	Valentin Haenel	2011-05-05	1	-1/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.txt: 'interactive.singlekey; is used by...	Valentin Haenel	2011-05-05	1	-2/+3
\| \|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-add-p-overlapping-hunks'	Junio C Hamano	2011-05-11	3	-16/+54
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	t3701: add-p-fix makes the last test to pass	Junio C Hamano	2011-05-08	1	-1/+1