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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'jc/cache-unmerge'	Junio C Hamano	2010-01-20	1	-0/+6
\|\
\| *	resolve-undo: "checkout -m path" uses resolve-undo information	Junio C Hamano	2009-12-25	1	-0/+4
\| *	resolve-undo: record resolved conflicts in a new index extension section	Junio C Hamano	2009-12-25	1	-0/+2
* \|	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	Junio C Hamano	2010-01-17	1	-1/+1
\|\ \
\| * \|	checkout -m path: fix recreating conflicts	Junio C Hamano	2010-01-06	1	-1/+1
* \| \|	Merge branch 'jc/checkout-merge-base'	Junio C Hamano	2010-01-13	1	-2/+5
\|\ \ \
\| * \| \|	"checkout A...B" switches to the merge base between A and B	Junio C Hamano	2009-10-18	1	-2/+5
* \| \| \|	Merge branch 'maint-1.6.2' into maint	Junio C Hamano	2010-01-10	1	-2/+8
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Merge branch 'maint-1.6.1' into maint-1.6.2	Junio C Hamano	2010-01-10	1	-2/+8
\| \|\ \ \
\| \| * \ \	Merge branch 'maint-1.6.0' into maint-1.6.1	Junio C Hamano	2010-01-10	1	-2/+8
\| \| \|\ \ \
\| \| \| * \| \|	checkout -m: do not try to fall back to --merge from an unborn branch	Junio C Hamano	2010-01-06	1	-2/+8
* \| \| \| \| \|	fixup tr/stash-format merge	Junio C Hamano	2009-10-30	1	-1/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Refactor pretty_print_commit arguments into a struct	Thomas Rast	2009-10-19	1	-1/+2
* \| \| \| \| \|	git checkout --no-guess	Junio C Hamano	2009-10-21	1	-0/+5
* \| \| \| \| \|	DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"	Junio C Hamano	2009-10-18	1	-3/+57
\|/ / / / /
* \| \| \| \|	Merge branch 'tr/reset-checkout-patch'	Junio C Hamano	2009-09-07	1	-0/+19
\|\ \ \ \ \
\| * \| \| \| \|	Implement 'git checkout --patch'	Thomas Rast	2009-08-15	1	-0/+19
* \| \| \| \| \|	UI consistency: allow --force for where -f means force	René Scharfe	2009-08-29	1	-1/+1
* \| \| \| \| \|	Merge branch 'jk/maint-1.6.3-checkout-unborn'	Junio C Hamano	2009-08-28	1	-9/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	checkout: do not imply "-f" on unborn branches	Jeff King	2009-08-25	1	-9/+3
\| * \| \| \| \|	Merge branch 'lt/maint-diff-reduce-lstat' into maint	Junio C Hamano	2009-05-25	1	-2/+2
\| \|\ \ \ \ \
* \| \| \| \| \| \|	parse-opts: prepare for OPT_FILENAME	Stephen Boyd	2009-05-25	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'lt/maint-diff-reduce-lstat'	Junio C Hamano	2009-05-23	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| / / / / / \| \|/ / / / /
\| * \| \| \| \|	Teach 'git checkout' to preload the index contents	Linus Torvalds	2009-05-09	1	-2/+2
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	builtin-checkout: Don't tell user that HEAD has moved before it has	Daniel Cordero	2009-05-16	1	-8/+8
* \| \| \| \|	Merge branch 'maint-1.6.2' into maint	Junio C Hamano	2009-05-12	1	-8/+1
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Revert "checkout branch: prime cache-tree fully"	Junio C Hamano	2009-05-12	1	-8/+1
* \| \| \| \|	Merge branch 'jc/maint-read-tree-multi'	Junio C Hamano	2009-04-22	1	-1/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	checkout branch: prime cache-tree fully	Junio C Hamano	2009-04-20	1	-1/+8
\| * \| \| \|	Move prime_cache_tree() to cache-tree.c	Junio C Hamano	2009-04-20	1	-0/+1
\| * \| \| \|	Merge branch 'js/maint-submodule-checkout' into maint	Junio C Hamano	2009-04-18	1	-3/+0
\| \|\ \ \ \
* \| \| \| \| \|	Fix typos / spelling in comments	Mike Ralphson	2009-04-22	1	-1/+1
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2009-04-07	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Change double quotes to single quotes in message	Jari Aalto	2009-04-07	1	-3/+3
* \| \| \| \| \|	Merge branch 'js/maint-submodule-checkout'	Junio C Hamano	2009-04-07	1	-3/+0
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Fix 'git checkout <submodule>' to update the index	Johannes Schindelin	2009-04-02	1	-3/+0
\| \|/ / / /
* \| \| \| \|	Merge branch 'jc/name-branch'	Junio C Hamano	2009-04-06	1	-12/+6
\|\ \ \ \ \
\| * \| \| \| \|	strbuf_check_branch_ref(): a helper to check a refname for a branch	Junio C Hamano	2009-03-22	1	-4/+3
\| * \| \| \| \|	strbuf_branchname(): a wrapper for branch name shorthands	Junio C Hamano	2009-03-22	1	-8/+3
\| * \| \| \| \|	Rename interpret/substitute nth_last_branch functions	Junio C Hamano	2009-03-22	1	-1/+1
* \| \| \| \| \|	builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")	Miklos Vajna	2009-03-23	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'mv/parseopt-ls-files'	Junio C Hamano	2009-03-20	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Turn the flags in struct dir_struct into a single variable	Johannes Schindelin	2009-02-18	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Fix neglect of diff_setup()/diff_setup_done() symmetry.	Keith Cascio	2009-03-04	1	-0/+2
\|/ / / /
* \| \| \|	Merge branch 'tr/previous-branch'	Junio C Hamano	2009-01-28	1	-2/+13
\|\ \ \ \
\| * \| \| \|	checkout: implement "-" abbreviation, add docs and tests	Thomas Rast	2009-01-17	1	-0/+3
\| * \| \| \|	sha1_name: tweak @{-N} lookup	Thomas Rast	2009-01-17	1	-1/+3
\| * \| \| \|	checkout: implement "@{-N}" shortcut name for N-th last branch	Junio C Hamano	2009-01-17	1	-2/+8
* \| \| \| \|	Merge branch 'cb/add-pathspec'	Junio C Hamano	2009-01-25	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	remove pathspec_match, use match_pathspec instead	Clemens Buchacher	2009-01-14	1	-3/+3
\| \| \|/ / / \| \|/\| \| \|