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

	Commit message (Expand)	Author	Age
*	Merge branch 'js/lift-parent-count-limit'	Junio C Hamano	2014-01-10
\|\
\| *	Remove the line length limit for graft files	Johannes Schindelin	2013-12-27
* \|	Merge branch 'jk/test-framework-updates'	Junio C Hamano	2014-01-10
\|\ \
\| * \|	t0000: drop "known breakage" test	Jeff King	2014-01-02
\| * \|	t0000: simplify HARNESS_ACTIVE hack	Jeff King	2014-01-02
\| * \|	t0000: set TEST_OUTPUT_DIRECTORY for sub-tests	Jeff King	2014-01-02
\| \|/
\| *	Merge branch 'jk/two-way-merge-corner-case-fix' into maint	Junio C Hamano	2013-12-17
\| \|\
\| * \	Merge branch 'sb/sha1-loose-object-info-check-existence' into maint	Junio C Hamano	2013-12-17
\| \|\ \
\| * \ \	Merge branch 'nd/magic-pathspec' into maint	Junio C Hamano	2013-12-17
\| \|\ \ \
* \| \ \ \	Merge branch 'bm/merge-base-octopus-dedup'	Junio C Hamano	2014-01-10
\|\ \ \ \ \
\| * \| \| \| \|	merge-base --octopus: reduce the result from get_octopus_merge_bases()	Junio C Hamano	2013-12-30
* \| \| \| \| \|	Merge branch 'jk/http-auth-tests-robustify'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \
\| * \| \| \| \| \|	use distinct username/password for http auth tests	Jeff King	2014-01-02
* \| \| \| \| \| \|	Merge branch 'jk/oi-delta-base'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	cat-file: provide %(deltabase) batch format	Jeff King	2013-12-26
* \| \| \| \| \| \| \|	Merge branch 'nd/add-empty-fix'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	add: don't complain when adding empty project root	Nguyễn Thái Ngọc Duy	2013-12-26
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'tm/fetch-prune'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fetch --prune: Run prune before fetching	Tom Miller	2014-01-03
\| * \| \| \| \| \| \| \|	fetch --prune: always print header url	Tom Miller	2014-01-03
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sb/diff-orderfile-config'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	diff: add diff.orderfile configuration variable	Samuel Bronson	2013-12-18
\| * \| \| \| \| \| \| \|	diff: let "git diff -O" read orderfile from any file and fail properly	Samuel Bronson	2013-12-18
\| * \| \| \| \| \| \| \|	t4056: add new tests for "git diff -O"	Samuel Bronson	2013-12-18
* \| \| \| \| \| \| \| \|	Merge branch 'bc/log-decoration'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	log: properly handle decorations with chained tags	brian m. carlson	2013-12-20
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'cc/replace-object-info'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	replace info: rename 'full' to 'long' and clarify in-code symbols	Christian Couder	2013-12-30
\| * \| \| \| \| \| \| \| \|	builtin/replace: unset read_replace_refs	Christian Couder	2013-12-12
\| * \| \| \| \| \| \| \| \|	t6050: add tests for listing with --format	Christian Couder	2013-12-12
\| * \| \| \| \| \| \| \| \|	sha1_file: perform object replacement in sha1_object_info_extended()	Christian Couder	2013-12-12
\| * \| \| \| \| \| \| \| \|	t6050: show that git cat-file --batch fails with replace objects	Christian Couder	2013-12-12
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'nd/negative-pathspec'	Junio C Hamano	2014-01-10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Support pathspec magic :(exclude) and its short form :!	Nguyễn Thái Ngọc Duy	2013-12-06
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/name-pack-after-byte-representation'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	pack-objects: name pack files after trailer hash	Jeff King	2013-12-05
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tg/diff-no-index-refactor'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	diff: add test for --no-index executed outside repo	Thomas Gummerer	2013-12-16
\| * \| \| \| \| \| \| \| \| \| \|	diff: don't read index when --no-index is given	Thomas Gummerer	2013-12-12
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zk/difftool-counts'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	difftool: display the number of files in the diff queue in the prompt	Zoltan Klinger	2013-12-06
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/cat-file-regression-fix'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	cat-file: handle --batch format with missing type/size	Jeff King	2013-12-12
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/pull-rebase-using-fork-point'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	rebase: use reflog to find common base with upstream	John Keeping	2013-12-10
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/rev-parse-double-dashes'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	rev-parse: correctly diagnose revision errors before "--"	Jeff King	2013-12-09
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/push-refmap'	Junio C Hamano	2013-12-27
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	push: also use "upstream" mapping when pushing a single ref	Junio C Hamano	2013-12-04
\| * \| \| \| \| \| \| \| \| \| \|	push: use remote.$name.push as a refmap	Junio C Hamano	2013-12-04
\| \|/ / / / / / / / / /