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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'tr/http-push-ref-status'	Junio C Hamano	2010-01-20	1	-0/+44
\|\
\| *	transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...	Tay Ray Chuan	2010-01-09	1	-1/+1
\| *	transport.c::transport_push(): make ref status affect return value	Tay Ray Chuan	2010-01-09	1	-2/+2
\| *	refactor ref status logic for pushing	Tay Ray Chuan	2010-01-09	1	-2/+2
\| *	t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs	Tay Ray Chuan	2010-01-09	1	-0/+21
\| *	t5541-http-push.sh: add tests for non-fast-forward pushes	Tay Ray Chuan	2010-01-09	1	-0/+23
* \|	Merge branch 'bk/fix-relative-gitdir-file'	Junio C Hamano	2010-01-20	1	-0/+38
\|\ \
\| * \|	Handle relative paths in submodule .git files	Brad King	2010-01-09	1	-1/+1
\| * \|	Test update-index for a gitlink to a .git file	Brad King	2010-01-09	1	-0/+38
* \| \|	Merge branch 'jc/rerere'	Junio C Hamano	2010-01-18	1	-0/+15
\|\ \ \
\| * \| \|	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04	1	-0/+15
* \| \| \|	Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'	Junio C Hamano	2010-01-18	1	-0/+9
\|\ \ \ \
\| * \| \| \|	Remove empty directories when checking out a commit with fewer submodules	Peter Collingbourne	2010-01-11	1	-0/+9
* \| \| \| \|	Merge branch 'tc/test-locate-httpd'	Junio C Hamano	2010-01-17	1	-6/+24
\|\ \ \ \ \
\| * \| \| \| \|	t/lib-http.sh: Restructure finding of default httpd location	Tarmigan Casebolt	2010-01-06	1	-6/+24
\| \|/ / / /
* \| \| \| \|	Merge branch 'jh/commit-status'	Junio C Hamano	2010-01-17	1	-0/+109
\|\ \ \ \ \
\| * \| \| \| \|	t7502: test commit.status, --status and --no-status	Junio C Hamano	2010-01-13	1	-0/+109
* \| \| \| \| \|	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	Junio C Hamano	2010-01-17	1	-0/+57
\|\ \ \ \ \ \
\| * \| \| \| \| \|	checkout -m path: fix recreating conflicts	Junio C Hamano	2010-01-06	1	-0/+57
* \| \| \| \| \| \|	Merge branch 'tc/clone-v-progress'	Junio C Hamano	2010-01-17	1	-1/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	clone: use --progress to force progress reporting	Tay Ray Chuan	2009-12-28	1	-1/+2
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tc/smart-http-restrict'	Junio C Hamano	2010-01-17	5	-260/+349
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Test t5560: Fix test when run with dash	Tarmigan Casebolt	2010-01-15	1	-5/+10
\| * \| \| \| \| \| \|	Smart-http tests: Test http-backend without curl or a webserver	Tarmigan Casebolt	2010-01-06	2	-6/+25
\| * \| \| \| \| \| \|	Smart-http tests: Break test t5560-http-backend into pieces	Tarmigan Casebolt	2010-01-06	3	-147/+173
\| * \| \| \| \| \| \|	Smart-http tests: Improve coverage in test t5560	Tarmigan Casebolt	2010-01-06	1	-11/+10
\| * \| \| \| \| \| \|	Smart-http: check if repository is OK to export before serving it	Tarmigan Casebolt	2010-01-06	2	-2/+42
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'jk/run-command-use-shell'	Junio C Hamano	2010-01-17	3	-3/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	t4030, t4031: work around bogus MSYS bash path conversion	Johannes Sixt	2010-01-05	2	-2/+2
\| * \| \| \| \| \| \|	textconv: use shell to run helper	Jeff King	2010-01-05	2	-2/+2
\| * \| \| \| \| \| \|	t0021: use $SHELL_PATH for the filter script	Johannes Sixt	2010-01-05	1	-1/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'sr/gfi-options'	Junio C Hamano	2010-01-17	1	-0/+152
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fast-import: add (non-)relative-marks feature	Sverre Rabbelier	2009-12-05	1	-0/+25
\| * \| \| \| \| \| \|	fast-import: allow for multiple --import-marks= arguments	Sverre Rabbelier	2009-12-04	1	-0/+22
\| * \| \| \| \| \| \|	fast-import: test the new option command	Sverre Rabbelier	2009-12-04	1	-1/+36
\| * \| \| \| \| \| \|	fast-import: add feature command	Sverre Rabbelier	2009-12-04	1	-0/+70
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cc/reset-more'	Junio C Hamano	2010-01-16	1	-10/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	t7111: fix bad HEAD in tests with unmerged entries	Christian Couder	2010-01-16	1	-10/+10
* \| \| \| \| \| \| \|	Merge branch 'jc/checkout-merge-base'	Junio C Hamano	2010-01-13	2	-1/+131
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rebase -i: teach --onto A...B syntax	Nanako Shiraishi	2010-01-07	1	-0/+30
\| * \| \| \| \| \| \| \|	rebase: fix --onto A...B parsing and add tests	Nanako Shiraishi	2010-01-07	1	-0/+75
\| * \| \| \| \| \| \| \|	"checkout A...B" switches to the merge base between A and B	Junio C Hamano	2009-10-18	1	-1/+26
* \| \| \| \| \| \| \| \|	Merge branch 'cc/reset-more'	Junio C Hamano	2010-01-13	2	-0/+296
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	t7111: check that reset options work as described in the tables	Christian Couder	2010-01-09	1	-0/+113
\| * \| \| \| \| \| \| \|	"reset --merge": fix unmerged case	Junio C Hamano	2010-01-03	1	-9/+31
\| * \| \| \| \| \| \| \|	reset: use "unpack_trees()" directly instead of "git read-tree"	Stephan Beyer	2010-01-03	1	-5/+7
\| * \| \| \| \| \| \| \|	reset: add a few tests for "git reset --merge"	Christian Couder	2009-12-30	1	-0/+159
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'nd/sparse'	Junio C Hamano	2010-01-13	7	-0/+581
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	t7002: test for not using external grep on skip-worktree paths	Nguyễn Thái Ngọc Duy	2010-01-06	1	-0/+12
\| * \| \| \| \| \| \| \|	t7002: set test prerequisite "external-grep" if supported	Nguyễn Thái Ngọc Duy	2010-01-06	1	-0/+12