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

	Commit message (Expand)	Author	Age	Files	Lines
*	t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'	Brandon Casey	2008-10-12	1	-1/+1
*	Merge branch 'maint'	Shawn O. Pearce	2008-10-10	2	-1/+13
\|\
\| *	rebase -i: do not fail when there is no commit to cherry-pick	Johannes Schindelin	2008-10-10	1	-0/+11
\| *	test-lib: fix color reset in say_color()	Miklos Vajna	2008-10-10	1	-1/+2
* \|	Merge branch 'dm/svn-branch'	Shawn O. Pearce	2008-10-09	1	-0/+59
\|\ \
\| * \|	Add git-svn branch to allow branch creation in SVN repositories	Florian Ragwitz	2008-10-06	1	-0/+59
* \| \|	Merge branch 'jc/add-ita'	Shawn O. Pearce	2008-10-09	1	-0/+36
\|\ \ \
\| * \| \|	git-add --intent-to-add (-N)	Junio C Hamano	2008-08-31	1	-0/+36
* \| \| \|	Merge branch 'mv/merge-refresh'	Shawn O. Pearce	2008-10-09	1	-0/+9
\|\ \ \ \
\| * \| \| \|	builtin-merge: refresh the index before calling a strategy	Miklos Vajna	2008-10-03	1	-0/+9
* \| \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-10-08	2	-8/+49
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	git init: --bare/--shared overrides system/global config	Deskin Miller	2008-10-08	1	-0/+32
\| * \| \|	git rm: refresh index before up-to-date check	Johannes Schindelin	2008-10-08	1	-8/+17
* \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-10-06	2	-0/+147
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	Teach rebase -i to honor pre-rebase hook	Nanako Shiraishi	2008-10-06	1	-0/+126
\| * \|	fix bogus "diff --git" header from "diff --no-index"	Linus Torvalds	2008-10-06	1	-0/+21
* \| \|	tests: add a testcase for "git submodule sync"	David Aguilar	2008-10-02	1	-0/+64
* \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-10-02	1	-0/+49
\|\ \ \ \| \|/ /
\| * \|	gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh	Jakub Narebski	2008-10-02	1	-0/+49
* \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-30	1	-0/+0
\|\ \ \ \| \|/ /
\| * \|	t0024: add executable permission	SZEDER Gábor	2008-09-30	1	-0/+0
* \| \|	tests: grep portability fixes	Jeff King	2008-09-30	8	-11/+11
* \| \|	Merge branch 'bc/master-diff-hunk-header-fix'	Shawn O. Pearce	2008-09-29	1	-1/+12
\|\ \ \
\| * \ \	Merge branch 'maint' into bc/master-diff-hunk-header-fix	Shawn O. Pearce	2008-09-29	8	-13/+324
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge branch 'bc/maint-diff-hunk-header-fix' into maint	Shawn O. Pearce	2008-09-29	1	-1/+12
\| \| \|\ \
\| * \| \| \|	t4018-diff-funcname: test syntax of builtin xfuncname patterns	Brandon Casey	2008-09-23	1	-1/+1
\| * \| \| \|	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	Junio C Hamano	2008-09-22	1	-0/+11
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	t4018-diff-funcname: test syntax of builtin xfuncname patterns	Brandon Casey	2008-09-22	1	-0/+11
\| * \| \| \|	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	Junio C Hamano	2008-09-18	5	-17/+60
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	diff.*.xfuncname which uses "extended" regex's for hunk header selection	Brandon Casey	2008-09-18	1	-1/+1
* \| \| \| \|	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29	2	-2/+165
\|\ \ \ \ \
\| * \| \| \| \|	checkout --conflict=<style>: recreate merge in a non-default style	Junio C Hamano	2008-08-31	1	-46/+54
\| * \| \| \| \|	checkout -m: recreate merge when checking out of unmerged index	Junio C Hamano	2008-08-30	1	-0/+63
\| * \| \| \| \|	Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'	Junio C Hamano	2008-08-30	1	-0/+70
\| \|\ \ \ \ \
\| \| * \| \| \| \|	checkout --ours/--theirs: allow checking out one side of a conflicting merge	Junio C Hamano	2008-08-30	1	-0/+25
\| \| * \| \| \| \|	checkout -f: allow ignoring unmerged paths when checking out of the index	Junio C Hamano	2008-08-30	1	-0/+23
\| * \| \| \| \| \|	merge.conflictstyle: choose between "merge" and "diff3 -m" styles	Junio C Hamano	2008-08-30	1	-1/+8
\| * \| \| \| \| \|	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	2008-08-30	1	-0/+37
* \| \| \| \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-26	1	-0/+11
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Remove empty directories in recursive merge	Alex Riesen	2008-09-26	1	-0/+11
* \| \| \| \| \| \|	Merge branch 'mv/merge-recursive'	Shawn O. Pearce	2008-09-25	1	-0/+22
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	builtin-merge: release the lockfile in try_merge_strategy()	Miklos Vajna	2008-09-06	1	-0/+22
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'am/status'	Shawn O. Pearce	2008-09-25	1	-0/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	wt-status: Teach how to discard changes in the working directory	Anders Melchiorsen	2008-09-07	1	-0/+10
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mv/commit-tree'	Shawn O. Pearce	2008-09-25	1	-0/+53
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	t7603: add new testcases to ensure builtin-commit uses reduce_heads()	Miklos Vajna	2008-09-10	1	-0/+53
* \| \| \| \| \| \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-25	1	-0/+10
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	maint: check return of split_cmdline to avoid bad config strings	Deskin Miller	2008-09-24	1	-0/+10
* \| \| \| \| \| \| \|	git-svn: do a partial rebuild if rev_map is out-of-date	Deskin Miller	2008-09-21	1	-1/+1
* \| \| \| \| \| \| \|	git-svn: testcase for partial rebuild	Deskin Miler	2008-09-21	1	-0/+59