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

	Commit message (Expand)	Author	Age
*	Merge branch 'mz/cherry-pick-cmdline-order' into maint	Junio C Hamano	2012-09-14
\|\
\| *	cherry-pick/revert: respect order of revisions to pick	Martin von Zweigbergk	2012-08-30
\| *	demonstrate broken 'git cherry-pick three one two'	Martin von Zweigbergk	2012-08-30
\| *	teach log --no-walk=unsorted, which avoids sorting	Martin von Zweigbergk	2012-08-30
* \|	Sync with 1.7.11.7	Junio C Hamano	2012-09-14
\|\ \
\| * \	Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11	Junio C Hamano	2012-09-14
\| \|\ \
\| \| * \|	log: fix --quiet synonym for -s	Jeff King	2012-08-28
\| * \| \|	Merge branch 'rj/test-regex' into maint-1.7.11	Junio C Hamano	2012-09-14
\| \|\ \ \
\| \| * \| \|	test-regex: Add a test to check for a bug in the regex routines	Ramsay Jones	2012-09-02
* \| \| \| \|	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 '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
\| \| * \| \| \| \| \|	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
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Sync with 1.7.11.6	Junio C Hamano	2012-09-11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	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 '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 '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 'jc/test-prereq' into maint	Junio C Hamano	2012-09-11
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	t3910: use the UTF8_NFD_TO_NFC test prereq	Michael J Gruber	2012-08-22
\| * \| \| \| \| \| \| \| \| \| \| \| \|	test-lib: provide UTF8 behaviour as a prerequisite	Michael J Gruber	2012-07-27
\| * \| \| \| \| \| \| \| \| \| \| \| \|	t0050: use the SYMLINKS test prereq	Michael J Gruber	2012-07-27
\| * \| \| \| \| \| \| \| \| \| \| \| \|	t0050: use the CASE_INSENSITIVE_FS test prereq	Michael J Gruber	2012-07-27
\| * \| \| \| \| \| \| \| \| \| \| \| \|	test-lib: provide case insensitivity as a prerequisite	Michael J Gruber	2012-07-27
\| * \| \| \| \| \| \| \| \| \| \| \| \|	test: allow prerequisite to be evaluated lazily	Junio C Hamano	2012-07-27
\| * \| \| \| \| \| \| \| \| \| \| \| \|	test: rename $satisfied to $satisfied_prereq	Junio C Hamano	2012-07-27
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint-1.7.11' into maint	Junio C Hamano	2012-09-10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11	Junio C Hamano	2012-09-10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	receive-pack: do not leak output from auto-gc to standard output	Junio C Hamano	2012-08-06