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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint-1.7.11' into maint	Junio C Hamano	2012-09-12
\|\
\| *	Merge branch 'jc/apply-binary-p0' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \|\
\| \| *	apply: compute patch->def_name correctly under -p0	Junio C Hamano	2012-08-24
\| * \|	Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \|\ \
\| \| * \|	specifying ranges: we did not mean to make ".." an empty set	Junio C Hamano	2012-08-23
\| * \| \|	Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....	Junio C Hamano	2012-09-12
\| \|\ \ \
\| \| * \| \|	doc: "git checkout -b/-B/--orphan" always takes a branch name	Junio C Hamano	2012-08-26
\| * \| \| \|	Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \|\ \ \ \
\| \| * \| \| \|	http: prompt for credentials on failed POST	Jeff King	2012-08-27
\| \| * \| \| \|	http: factor out http error code handling	Jeff King	2012-08-27
\| \| * \| \| \|	t: test http access to "half-auth" repositories	Jeff King	2012-08-27
\| \| * \| \| \|	t: test basic smart-http authentication	Jeff King	2012-08-27
\| \| * \| \| \|	t/lib-httpd: recognize /smart/ repos as smart-http	Jeff King	2012-08-27
\| \| * \| \| \|	t/lib-httpd: only route auth/dumb to dumb repos	Jeff King	2012-08-27
\| \| * \| \| \|	t5550: factor out http auth setup	Jeff King	2012-08-27
\| \| * \| \| \|	t5550: put auth-required repo in auth/dumb	Jeff King	2012-08-27
\| * \| \| \| \|	Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \|\ \ \ \ \
\| \| * \| \| \| \|	for-each-ref: Fix sort with multiple keys	Kacper Kornet	2012-08-21
\| \| * \| \| \| \|	t6300: test sort with multiple keys	Kacper Kornet	2012-08-21
\| \| \| \|/ / / \| \| \|/\| \| \|
* \| \| \| \| \|	Further merging down for 1.7.12.1	Junio C Hamano	2012-09-11
* \| \| \| \| \|	Sync with 1.7.11.6	Junio C Hamano	2012-09-11
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Git 1.7.11.6v1.7.11.6	Junio C Hamano	2012-09-11
\| * \| \| \| \|	Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \
\| \| * \| \| \| \|	mergetool: style fixes	Junio C Hamano	2012-08-23
\| * \| \| \| \| \|	Merge branch 'sz/submodule-force-update' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Make 'git submodule update --force' always check out submodules.	Stefan Zager	2012-08-24
\| * \| \| \| \| \| \|	Merge branch 'ph/stash-rerere' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	stash: invoke rerere in case of conflict	Phil Hord	2012-08-17
\| \| * \| \| \| \| \| \|	test: git-stash conflict sets up rerere	Phil Hord	2012-08-17
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	sane_execvp(): ignore non-directory on $PATH	Junio C Hamano	2012-07-31
\| * \| \| \| \| \| \| \|	Merge branch 'jc/maint-config-exit-status' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	config: "git config baa" should exit with status 1	Junio C Hamano	2012-07-30
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	git-config doc: unconfuse an example	Junio C Hamano	2012-08-18
\| \| * \| \| \| \| \| \| \|	git-config.txt: fix example	Michael Haggerty	2012-08-18
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Let submodule command exit with error status if path does not exist	Heiko Voigt	2012-08-14
\| * \| \| \| \| \| \| \| \|	Merge branch 'mz/empty-rebase-test' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	add tests for 'git rebase --keep-empty'	Martin von Zweigbergk	2012-08-09
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	docs: monospace listings in docbook output	Jeff King	2012-08-07
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix '\ No newline...' annotation in rewrite diffs	Adam Butcher	2012-08-05
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	t7406: fix misleading "rev-parse --max-count=1 HEAD"	Junio C Hamano	2012-07-30
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'tr/void-diff-setup-done' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	diff_setup_done(): return void	Thomas Rast	2012-08-03
\| \| \| \|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'tr/merge-recursive-flush' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	merge-recursive: eliminate flush_buffer() in favor of write_in_full()	Thomas Rast	2012-08-03
\| \| \|/ / / / / / / / / / /