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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'kb/full-history-compute-treesame-carefully-2'	Junio C Hamano	2013-06-14	3	-7/+247
\|\
\| *	revision.c: make default history consider bottom commits	Kevin Bracey	2013-05-16	1	-6/+6
\| *	revision.c: don't show all merges for --parents	Kevin Bracey	2013-05-16	1	-2/+2
\| *	revision.c: discount side branches when computing TREESAME	Kevin Bracey	2013-05-16	2	-6/+14
\| *	simplify-merges: drop merge from irrelevant side branch	Kevin Bracey	2013-05-16	1	-1/+1
\| *	simplify-merges: never remove all TREESAME parents	Kevin Bracey	2013-05-16	1	-2/+2
\| *	t6012: update test for tweaked full-history traversal	Junio C Hamano	2013-05-16	1	-6/+23
\| *	revision.c: Make --full-history consider more merges	Kevin Bracey	2013-05-16	2	-14/+14
\| *	t6111: add parents to tests	Kevin Bracey	2013-05-16	1	-19/+19
\| *	t6111: allow checking the parents as well	Junio C Hamano	2013-05-16	1	-9/+21
\| *	t6111: new TREESAME test set	Kevin Bracey	2013-05-16	1	-0/+184
\| *	t6019: test file dropped in -s ours merge	Kevin Bracey	2013-05-16	1	-0/+19
* \|	Merge branch 'maint'	Junio C Hamano	2013-06-11	1	-1/+1
\|\ \
\| * \	Merge branch 'maint-1.8.2' into maint	Junio C Hamano	2013-06-11	1	-1/+1
\| \|\ \
\| \| * \|	t0070 "mktemp to unwritable directory" needs SANITY	Torsten Bögershausen	2013-06-11	1	-1/+1
\| * \| \|	Merge branch 'kb/status-ignored-optim-2' into maint	Junio C Hamano	2013-06-09	1	-0/+18
\| \|\ \ \
* \| \ \ \	Merge branch 'rr/rebase-autostash'	Junio C Hamano	2013-06-11	1	-0/+148
\|\ \ \ \ \
\| * \| \| \| \|	rebase: implement --[no-]autostash and rebase.autostash	Ramkumar Ramachandra	2013-05-29	1	-0/+148
* \| \| \| \| \|	Merge branch 'jk/test-exit-code-by-signal'	Junio C Hamano	2013-06-11	1	-0/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t0005: skip signal death exit code test on Windows	Johannes Sixt	2013-06-06	1	-1/+1
\| * \| \| \| \| \|	t0005: test git exit code from signal death	Jeff King	2013-06-02	1	-0/+7
* \| \| \| \| \| \|	Merge branch 'fc/at-head'	Junio C Hamano	2013-06-11	1	-20/+48
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add new @ shortcut for HEAD	Felipe Contreras	2013-05-08	1	-0/+2
\| * \| \| \| \| \| \|	tests: at-combinations: @{N} versus HEAD@{N}	Ramkumar Ramachandra	2013-05-08	1	-0/+13
\| * \| \| \| \| \| \|	tests: at-combinations: increase coverage	Ramkumar Ramachandra	2013-05-08	1	-0/+8
\| * \| \| \| \| \| \|	tests: at-combinations: improve nonsense()	Felipe Contreras	2013-05-08	1	-1/+1
\| * \| \| \| \| \| \|	tests: at-combinations: check ref names directly	Felipe Contreras	2013-05-08	1	-16/+23
\| * \| \| \| \| \| \|	tests: at-combinations: simplify setup	Felipe Contreras	2013-05-07	1	-4/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ar/wildmatch-foldcase'	Junio C Hamano	2013-06-11	1	-6/+49
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	wildmatch: properly fold case everywhere	Anthony Ramine	2013-06-02	1	-6/+49
* \| \| \| \| \| \| \|	Merge branch 'nd/warn-ambiguous-object-name'	Junio C Hamano	2013-06-11	1	-0/+18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	get_sha1: warn about full or short object names that look like refs	Nguyễn Thái Ngọc Duy	2013-05-29	1	-0/+18
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'cb/log-follow-with-combined'	Junio C Hamano	2013-06-11	1	-0/+14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix segfault with git log -c --follow	Clemens Buchacher	2013-05-28	1	-0/+14
* \| \| \| \| \| \| \| \|	Merge branch 'tr/test-commit-only-on-orphan'	Junio C Hamano	2013-06-11	1	-0/+13
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Test 'commit --only' after 'checkout --orphan'	Thomas Rast	2013-06-02	1	-0/+13
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rr/die-on-missing-upstream'	Junio C Hamano	2013-06-11	1	-10/+5
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	sha1_name: fix error message for @{u}	Ramkumar Ramachandra	2013-05-22	1	-10/+5
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ks/difftool-dir-diff-copy-fix'	Junio C Hamano	2013-06-06	1	-0/+19
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	difftool --dir-diff: allow changing any clean working tree file	Kenichi Saita	2013-05-29	1	-0/+19
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fc/show-branch-in-rebase-am'	Junio C Hamano	2013-06-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	prompt: fix for simple rebase	Felipe Contreras	2013-05-29	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'nd/clone-connectivity-shortcut'	Junio C Hamano	2013-06-06	1	-0/+7
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fetch-pack: prepare updated shallow file before fetching the pack	Nguyễn Thái Ngọc Duy	2013-05-28	1	-0/+7
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs/commit-m-no-edit'	Junio C Hamano	2013-06-05	1	-0/+17
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	commit: don't start editor if empty message is given with -m	René Scharfe	2013-05-28	1	-0/+17
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fc/send-email-chainreplyto-warning'	Junio C Hamano	2013-06-05	1	-49/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	send-email: remove warning about unset chainreplyto	Felipe Contreras	2013-05-28	1	-49/+0
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fc/cleanups'	Junio C Hamano	2013-06-05	3	-17/+10
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	test: rebase: fix --interactive test	Felipe Contreras	2013-05-28	1	-1/+1