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

	Commit message (Expand)	Author	Age
*	Merge branch 'ld/p4-editor-multi-words'	Junio C Hamano	2015-06-05
\|\
\| *	git-p4: tests: use test-chmtime in place of touch	Luke Diamand	2015-05-26
\| *	git-p4: fix handling of multi-word P4EDITOR	Luke Diamand	2015-05-24
\| *	git-p4: add failing test for P4EDITOR handling	Luke Diamand	2015-05-24
* \|	Merge branch 'jk/at-push-sha1'	Junio C Hamano	2015-06-05
\|\ \
\| * \|	for-each-ref: accept "%(push)" format	Jeff King	2015-05-22
\| * \|	sha1_name: implement @{push} shorthand	Jeff King	2015-05-22
\| * \|	remote.c: report specific errors from branch_get_upstream	Jeff King	2015-05-21
* \| \|	Merge branch 'mm/rebase-i-post-rewrite-exec'	Junio C Hamano	2015-06-01
\|\ \ \
\| * \| \|	t5407: use <<- to align the expected output	Junio C Hamano	2015-05-22
\| * \| \|	rebase -i: fix post-rewrite hook with failed exec command	Matthieu Moy	2015-05-22
\| * \| \|	rebase -i: demonstrate incorrect behavior of post-rewrite	Matthieu Moy	2015-05-22
* \| \| \|	Merge branch 'fm/fetch-raw-sha1'	Junio C Hamano	2015-06-01
\|\ \ \ \
\| * \| \| \|	upload-pack: optionally allow fetching reachable sha1	Fredrik Medley	2015-05-22
* \| \| \| \|	Merge branch 'dt/cat-file-follow-symlinks'	Junio C Hamano	2015-06-01
\|\ \ \ \ \
\| * \| \| \| \|	cat-file: add --follow-symlinks to --batch	David Turner	2015-05-20
* \| \| \| \| \|	Merge branch 'jk/stash-options'	Junio C Hamano	2015-06-01
\|\ \ \ \ \ \
\| * \| \| \| \| \|	stash: complain about unknown flags	Jeff King	2015-05-20
* \| \| \| \| \| \|	Merge branch 'jh/filter-empty-contents'	Junio C Hamano	2015-06-01
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	sha1_file: pass empty buffer to index empty file	Jim Hill	2015-05-18
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jk/http-backend-deadlock'	Junio C Hamano	2015-06-01
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock	Junio C Hamano	2015-05-25
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3	Junio C Hamano	2015-05-25
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	http-backend: spool ref negotiation requests to buffer	Jeff King	2015-05-25
\| \| \| * \| \| \| \| \|	t5551: factor out tag creation	Jeff King	2015-05-20
\| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'nd/untracked-cache'	Junio C Hamano	2015-05-27
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	t7063: hide stderr from setup inside prereq	Jeff King	2015-05-27
* \| \| \| \| \| \| \| \|	Merge branch 'nd/untracked-cache'	Junio C Hamano	2015-05-26
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	t7063: tests for untracked cache	Nguyễn Thái Ngọc Duy	2015-03-12
* \| \| \| \| \| \| \| \|	Merge branch 'pt/pull-ff-vs-merge-ff'	Junio C Hamano	2015-05-26
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	pull: make pull.ff=true override merge.ff	Paul Tan	2015-05-18
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'pt/pull-log-n'	Junio C Hamano	2015-05-26
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	pull: handle --log=<n>	Paul Tan	2015-05-18
\| * \| \| \| \| \| \| \| \|	Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3	Junio C Hamano	2015-05-11
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'jc/diff-no-index-d-f' into maint-2.3	Junio C Hamano	2015-05-11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sb/t1020-cleanup'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	subdirectory tests: code cleanup, uncomment test	Stefan Beller	2015-05-18
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/ignore-epipe-in-filter'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	filter_buffer_or_fd(): ignore EPIPE	Junio C Hamano	2015-05-20
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mh/lockfile-retry'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	lock_packed_refs(): allow retries when acquiring the packed-refs lock	Michael Haggerty	2015-05-14
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/add-e-kill-editor'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	add: check return value of launch_editor	Jeff King	2015-05-12
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sg/completion-config'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	completion: simplify query for config variables	SZEDER Gábor	2015-05-12
\| * \| \| \| \| \| \| \| \| \| \| \|	completion: add a helper function to get config variables	SZEDER Gábor	2015-05-12
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mh/ref-directory-file'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	ref_transaction_commit(): delete extra "the" from error message	Michael Haggerty	2015-05-11
\| * \| \| \| \| \| \| \| \| \| \| \|	lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts	Michael Haggerty	2015-05-11
\| * \| \| \| \| \| \| \| \| \| \| \|	refs: check for D/F conflicts among refs created in a transaction	Michael Haggerty	2015-05-11