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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint'	Shawn O. Pearce	2008-09-30
\|\
\| *	t0024: add executable permission	SZEDER Gábor	2008-09-30
* \|	tests: grep portability fixes	Jeff King	2008-09-30
* \|	Merge branch 'bc/master-diff-hunk-header-fix'	Shawn O. Pearce	2008-09-29
\|\ \
\| * \	Merge branch 'maint' into bc/master-diff-hunk-header-fix	Shawn O. Pearce	2008-09-29
\| \|\ \ \| \| \|/
\| \| *	Merge branch 'bc/maint-diff-hunk-header-fix' into maint	Shawn O. Pearce	2008-09-29
\| \| \|\
\| * \| \|	t4018-diff-funcname: test syntax of builtin xfuncname patterns	Brandon Casey	2008-09-23
\| * \| \|	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	Junio C Hamano	2008-09-22
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	t4018-diff-funcname: test syntax of builtin xfuncname patterns	Brandon Casey	2008-09-22
\| * \| \|	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	Junio C Hamano	2008-09-18
\| \|\ \ \ \| \| \|/ /
\| \| * \|	diff.*.xfuncname which uses "extended" regex's for hunk header selection	Brandon Casey	2008-09-18
* \| \| \|	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29
\|\ \ \ \
\| * \| \| \|	checkout --conflict=<style>: recreate merge in a non-default style	Junio C Hamano	2008-08-31
\| * \| \| \|	checkout -m: recreate merge when checking out of unmerged index	Junio C Hamano	2008-08-30
\| * \| \| \|	Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'	Junio C Hamano	2008-08-30
\| \|\ \ \ \
\| \| * \| \| \|	checkout --ours/--theirs: allow checking out one side of a conflicting merge	Junio C Hamano	2008-08-30
\| \| * \| \| \|	checkout -f: allow ignoring unmerged paths when checking out of the index	Junio C Hamano	2008-08-30
\| * \| \| \| \|	merge.conflictstyle: choose between "merge" and "diff3 -m" styles	Junio C Hamano	2008-08-30
\| * \| \| \| \|	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	2008-08-30
* \| \| \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-26
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Remove empty directories in recursive merge	Alex Riesen	2008-09-26
* \| \| \| \| \|	Merge branch 'mv/merge-recursive'	Shawn O. Pearce	2008-09-25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	builtin-merge: release the lockfile in try_merge_strategy()	Miklos Vajna	2008-09-06
* \| \| \| \| \| \|	Merge branch 'am/status'	Shawn O. Pearce	2008-09-25
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	wt-status: Teach how to discard changes in the working directory	Anders Melchiorsen	2008-09-07
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mv/commit-tree'	Shawn O. Pearce	2008-09-25
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	t7603: add new testcases to ensure builtin-commit uses reduce_heads()	Miklos Vajna	2008-09-10
* \| \| \| \| \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-25
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	maint: check return of split_cmdline to avoid bad config strings	Deskin Miller	2008-09-24
* \| \| \| \| \| \| \|	git-svn: do a partial rebuild if rev_map is out-of-date	Deskin Miller	2008-09-21
* \| \| \| \| \| \| \|	git-svn: testcase for partial rebuild	Deskin Miler	2008-09-21
* \| \| \| \| \| \| \|	Merge branch 'db/maint-checkout-b'	Junio C Hamano	2008-09-21
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Check early that a new branch is new and valid	Daniel Barkalow	2008-09-21
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	t5510: test "git fetch" following tags minimally	Junio C Hamano	2008-09-21
* \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-09-18
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Make git archive respect core.autocrlf when creating zip format archives	Charles Bailey	2008-09-18
\| * \| \| \| \| \| \|	Add new test to demonstrate git archive core.autocrlf inconsistency	Charles Bailey	2008-09-18
\| * \| \| \| \| \| \|	git-svn: fix handling of even funkier branch names	Eric Wong	2008-09-18
\| * \| \| \| \| \| \|	git-svn: Always create a new RA when calling do_switch for svn://	Alec Berryman	2008-09-18
\| * \| \| \| \| \| \|	git-svn: factor out svnserve test code for later use	Alec Berryman	2008-09-18
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'np/pack'	Junio C Hamano	2008-09-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	t5300: improve SHA1 collision test	Nicolas Pitre	2008-09-02
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bw/shortref'	Junio C Hamano	2008-09-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	for-each-ref: `:short` format for `refname`	Bert Wesarg	2008-09-05
* \| \| \| \| \| \| \|	Merge branch 'tr/rev-list-reverse'	Junio C Hamano	2008-09-18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	t6013: replace use of 'tac' with equivalent Perl	Thomas Rast	2008-08-31
\| * \| \| \| \| \| \| \|	rev-list: fix --reverse interaction with --parents	Thomas Rast	2008-08-29
* \| \| \| \| \| \| \| \|	Merge branch 'cc/bisect'	Junio C Hamano	2008-09-18
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	bisect: only check merge bases when needed	Christian Couder	2008-08-27
\| * \| \| \| \| \| \| \| \|	bisect: test merge base if good rev is not an ancestor of bad rev	Christian Couder	2008-08-27