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

	Commit message (Expand)	Author	Age	Files	Lines
*	Make 'rerere forget' work from a subdirectory.	Johannes Sixt	2010-01-21	1	-22/+49
*	Make test case numbers unique	Johannes Sixt	2010-01-21	2	-0/+0
*	conflict-marker-size: add test and docs	Junio C Hamano	2010-01-20	1	-0/+12
*	Merge branch 'ag/patch-header-verify'	Junio C Hamano	2010-01-20	1	-0/+38
\|\
\| *	builtin-apply.c: fix the --- and +++ header filename consistency check	Andreas Gruenbacher	2010-01-18	1	-0/+38
* \|	Merge branch 'ag/maint-apply-too-large-p'	Junio C Hamano	2010-01-20	1	-0/+5
\|\ \
\| * \|	builtin-apply.c: Skip filenames without enough components	Andreas Gruenbacher	2010-01-18	1	-0/+5
* \| \|	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	2010-01-20	2	-1/+110
\|\ \ \
\| * \| \|	Extend merge-subtree tests to test -Xsubtree=dir.	Avery Pennarun	2010-01-17	1	-1/+46
\| * \| \|	Teach git-pull to pass -X<option> to git-merge	Avery Pennarun	2010-01-17	1	-0/+8
\| * \| \|	git merge -X<option>	Avery Pennarun	2010-01-17	1	-0/+56
* \| \| \|	Merge branch 'jh/notes' (early part)	Junio C Hamano	2010-01-20	3	-13/+766
\|\ \ \ \
\| * \| \| \|	Add more testcases to test fast-import of notes	Johan Herland	2009-12-07	1	-0/+623
\| * \| \| \|	Rename t9301 to t9350, to make room for more fast-import tests	Johan Herland	2009-12-07	1	-0/+0
\| * \| \| \|	fast-import: Proper notes tree manipulation	Johan Herland	2009-12-07	1	-13/+143
* \| \| \| \|	Merge branch 'jc/cache-unmerge'	Junio C Hamano	2010-01-20	1	-0/+143
\|\ \ \ \ \
\| * \| \| \| \|	rerere forget path: forget recorded resolution	Junio C Hamano	2010-01-10	1	-0/+25
\| * \| \| \| \|	resolve-undo: teach "update-index --unresolve" to use resolve-undo info	Junio C Hamano	2009-12-25	1	-0/+7
\| * \| \| \| \|	resolve-undo: "checkout -m path" uses resolve-undo information	Junio C Hamano	2009-12-25	1	-0/+11
\| * \| \| \| \|	resolve-undo: allow plumbing to clear the information	Junio C Hamano	2009-12-25	1	-0/+12
\| * \| \| \| \|	resolve-undo: basic tests	Junio C Hamano	2009-12-25	1	-0/+88
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'js/exec-error-report'	Junio C Hamano	2010-01-20	1	-0/+14
\|\ \ \ \ \
\| * \| \| \| \|	start_command: detect execvp failures early	Johannes Sixt	2010-01-10	1	-0/+14
\| * \| \| \| \|	Merge branch 'master' into il/vcs-helper	Junio C Hamano	2009-12-06	78	-210/+3548
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch 'jc/ls-files-ignored-pathspec'	Junio C Hamano	2010-01-20	1	-0/+39
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	ls-files: fix overeager pathspec optimization	Junio C Hamano	2010-01-08	1	-1/+1
\| * \| \| \| \| \| \|	t3001: test ls-files -o ignored/dir	Junio C Hamano	2010-01-08	1	-0/+39
* \| \| \| \| \| \| \|	Merge branch 'jc/grep-lookahead'	Junio C Hamano	2010-01-20	1	-23/+51
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	grep --no-index: allow use of "git grep" outside a git repository	Junio C Hamano	2010-01-15	1	-0/+52
\| * \| \| \| \| \| \| \|	grep: rip out support for external grep	Junio C Hamano	2010-01-13	1	-3/+3
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mm/conflict-advice'	Junio C Hamano	2010-01-20	2	-3/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	2010-01-12	2	-3/+5
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'da/difftool'	Junio C Hamano	2010-01-20	1	-12/+51
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	difftool: Update copyright notices to list each year separately	David Aguilar	2010-01-15	1	-1/+1
\| * \| \| \| \| \| \| \|	difftool: Use eval to expand '--extcmd' expressions	David Aguilar	2010-01-15	1	-0/+13
\| * \| \| \| \| \| \| \|	difftool: Add '-x' and as an alias for '--extcmd'	David Aguilar	2010-01-15	1	-0/+8
\| * \| \| \| \| \| \| \|	t7800-difftool.sh: Simplify the --extcmd test	David Aguilar	2010-01-15	1	-8/+5
\| * \| \| \| \| \| \| \|	difftool: Allow specifying unconfigured commands with --extcmd	David Aguilar	2010-01-09	1	-1/+18
\| * \| \| \| \| \| \| \|	difftool--helper: Remove use of the GIT_MERGE_TOOL variable	David Aguilar	2010-01-09	1	-9/+0
\| * \| \| \| \| \| \| \|	git-difftool: Add '--gui' for selecting a GUI tool	David Aguilar	2010-01-03	1	-0/+12
\| * \| \| \| \| \| \| \|	t7800-difftool: Set a bogus tool for use by tests	David Aguilar	2010-01-03	1	-1/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'mh/rebase-fixup'	Junio C Hamano	2010-01-20	2	-31/+76
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rebase -i: Retain user-edited commit messages after squash/fixup conflicts	Michael Haggerty	2010-01-14	1	-0/+36
\| * \| \| \| \| \| \| \|	t3404: Set up more of the test repo in the "setup" step	Michael Haggerty	2010-01-14	1	-25/+26
\| * \| \| \| \| \| \| \|	rebase -i: For fixup commands without squashes, do not start editor	Michael Haggerty	2010-01-14	1	-4/+3
\| * \| \| \| \| \| \| \|	rebase -i: Improve consistency of commit count in generated commit messages	Michael Haggerty	2010-01-14	1	-2/+2
\| * \| \| \| \| \| \| \|	t3404: Test the commit count in commit messages generated by "rebase -i"	Michael Haggerty	2010-01-14	2	-3/+12
* \| \| \| \| \| \| \| \|	Merge branch 'ns/rebase-auto-squash'	Junio C Hamano	2010-01-20	1	-0/+73
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	rebase -i --autosquash: auto-squash commits	Nanako Shiraishi	2010-01-06	1	-0/+73
* \| \| \| \| \| \| \| \| \|	Merge branch 'mh/rebase-fixup' (early part)	Junio C Hamano	2010-01-20	2	-53/+94
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|