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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/rerere'	Junio C Hamano	2010-01-18
\|\
\| *	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04
* \|	Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'	Junio C Hamano	2010-01-18
\|\ \
\| * \|	Remove empty directories when checking out a commit with fewer submodules	Peter Collingbourne	2010-01-11
* \| \|	Merge branch 'tc/test-locate-httpd'	Junio C Hamano	2010-01-17
\|\ \ \
\| * \| \|	t/lib-http.sh: Restructure finding of default httpd location	Tarmigan Casebolt	2010-01-06
\| \|/ /
* \| \|	Merge branch 'jh/commit-status'	Junio C Hamano	2010-01-17
\|\ \ \
\| * \| \|	t7502: test commit.status, --status and --no-status	Junio C Hamano	2010-01-13
* \| \| \|	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	Junio C Hamano	2010-01-17
\|\ \ \ \
\| * \| \| \|	checkout -m path: fix recreating conflicts	Junio C Hamano	2010-01-06
* \| \| \| \|	Merge branch 'tc/clone-v-progress'	Junio C Hamano	2010-01-17
\|\ \ \ \ \
\| * \| \| \| \|	clone: use --progress to force progress reporting	Tay Ray Chuan	2009-12-28
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'tc/smart-http-restrict'	Junio C Hamano	2010-01-17
\|\ \ \ \ \
\| * \| \| \| \|	Test t5560: Fix test when run with dash	Tarmigan Casebolt	2010-01-15
\| * \| \| \| \|	Smart-http tests: Test http-backend without curl or a webserver	Tarmigan Casebolt	2010-01-06
\| * \| \| \| \|	Smart-http tests: Break test t5560-http-backend into pieces	Tarmigan Casebolt	2010-01-06
\| * \| \| \| \|	Smart-http tests: Improve coverage in test t5560	Tarmigan Casebolt	2010-01-06
\| * \| \| \| \|	Smart-http: check if repository is OK to export before serving it	Tarmigan Casebolt	2010-01-06
\| \|/ / / /
* \| \| \| \|	Merge branch 'jk/run-command-use-shell'	Junio C Hamano	2010-01-17
\|\ \ \ \ \
\| * \| \| \| \|	t4030, t4031: work around bogus MSYS bash path conversion	Johannes Sixt	2010-01-05
\| * \| \| \| \|	textconv: use shell to run helper	Jeff King	2010-01-05
\| * \| \| \| \|	t0021: use $SHELL_PATH for the filter script	Johannes Sixt	2010-01-05
\| \|/ / / /
* \| \| \| \|	Merge branch 'sr/gfi-options'	Junio C Hamano	2010-01-17
\|\ \ \ \ \
\| * \| \| \| \|	fast-import: add (non-)relative-marks feature	Sverre Rabbelier	2009-12-05
\| * \| \| \| \|	fast-import: allow for multiple --import-marks= arguments	Sverre Rabbelier	2009-12-04
\| * \| \| \| \|	fast-import: test the new option command	Sverre Rabbelier	2009-12-04
\| * \| \| \| \|	fast-import: add feature command	Sverre Rabbelier	2009-12-04
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'cc/reset-more'	Junio C Hamano	2010-01-16
\|\ \ \ \ \
\| * \| \| \| \|	t7111: fix bad HEAD in tests with unmerged entries	Christian Couder	2010-01-16
* \| \| \| \| \|	Merge branch 'jc/checkout-merge-base'	Junio C Hamano	2010-01-13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rebase -i: teach --onto A...B syntax	Nanako Shiraishi	2010-01-07
\| * \| \| \| \| \|	rebase: fix --onto A...B parsing and add tests	Nanako Shiraishi	2010-01-07
\| * \| \| \| \| \|	"checkout A...B" switches to the merge base between A and B	Junio C Hamano	2009-10-18
* \| \| \| \| \| \|	Merge branch 'cc/reset-more'	Junio C Hamano	2010-01-13
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	t7111: check that reset options work as described in the tables	Christian Couder	2010-01-09
\| * \| \| \| \| \|	"reset --merge": fix unmerged case	Junio C Hamano	2010-01-03
\| * \| \| \| \| \|	reset: use "unpack_trees()" directly instead of "git read-tree"	Stephan Beyer	2010-01-03
\| * \| \| \| \| \|	reset: add a few tests for "git reset --merge"	Christian Couder	2009-12-30
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'nd/sparse'	Junio C Hamano	2010-01-13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t7002: test for not using external grep on skip-worktree paths	Nguyễn Thái Ngọc Duy	2010-01-06
\| * \| \| \| \| \|	t7002: set test prerequisite "external-grep" if supported	Nguyễn Thái Ngọc Duy	2010-01-06
\| * \| \| \| \| \|	commit: correctly respect skip-worktree bit	Nguyễn Thái Ngọc Duy	2009-12-14
\| * \| \| \| \| \|	tests: rename duplicate t1009	Jeff King	2009-11-25
\| * \| \| \| \| \|	sparse checkout: inhibit empty worktree	Nguyễn Thái Ngọc Duy	2009-08-23
\| * \| \| \| \| \|	Add tests for sparse checkout	Nguyễn Thái Ngọc Duy	2009-08-23
\| * \| \| \| \| \|	Read .gitignore from index if it is skip-worktree	Nguyễn Thái Ngọc Duy	2009-08-23
\| * \| \| \| \| \|	Teach Git to respect skip-worktree bit (writing part)	Nguyễn Thái Ngọc Duy	2009-08-23
\| * \| \| \| \| \|	Teach Git to respect skip-worktree bit (reading part)	Nguyễn Thái Ngọc Duy	2009-08-23
\| * \| \| \| \| \|	Introduce "skip-worktree" bit in index, teach Git to get/set this bit	Nguyễn Thái Ngọc Duy	2009-08-23
* \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-01-12
\|\ \ \ \ \ \ \