tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2016-04-04	t5520: test --[no-]autostash with pull.rebase=true	Mehul Jain	1	-0/+10
2016-04-04	t5520: reduce commom lines of code	Mehul Jain	1	-9/+7
2016-04-04	t5520: factor out common "failing autostash" code	Mehul Jain	1	-15/+11
2016-04-04	t5520: factor out common "successful autostash" code	Mehul Jain	1	-29/+15
2016-04-04	t5520: use better test to check stderr output	Mehul Jain	1	-6/+4
2016-04-04	t5520: ensure consistent test conditions	Mehul Jain	1	-0/+2
2016-04-04	t5520: use consistent capitalization in test titles	Mehul Jain	1	-2/+2
2016-03-21	pull --rebase: add --[no-]autostash flag	Mehul Jain	1	-0/+70
2016-01-13	pull: allow interactive rebase with --rebase=interactive	Johannes Schindelin	1	-0/+10
2015-08-17	Merge branch 'kd/pull-rebase-autostash'	Junio C Hamano	1	-0/+11
2015-07-22	pull: allow dirty tree when rebase.autostash enabled	Kevin Daudt	1	-0/+12
2015-06-02	pull: handle git-fetch's options as well	Paul Tan	1	-0/+20
2015-05-29	t5520: check reflog action in fast-forward merge	Paul Tan	1	-3/+10
2015-05-29	t5520: test --rebase failure on unborn branch with index	Paul Tan	1	-0/+15
2015-05-29	t5520: test --rebase with multiple branches	Paul Tan	1	-0/+9
2015-05-29	t5520: test work tree fast-forward when fetch updates head	Paul Tan	1	-0/+21
2015-05-29	t5520: test for failure if index has unresolved entries	Paul Tan	1	-0/+19
2015-05-18	t5520: test no merge candidates cases	Paul Tan	1	-0/+55
2015-05-18	t5520: prevent field splitting in content comparisons	Paul Tan	1	-35/+35
2015-04-29	t5520: test pulling an octopus into an unborn branch	Junio C Hamano	1	-0/+9
2015-04-29	t5520: style fixes	Junio C Hamano	1	-16/+6
2013-09-04	pull: allow pull to preserve merges when rebasing	Stephen Haberman	1	-0/+89
2013-06-27	Merge branch 'jk/pull-into-dirty-unborn'	Junio C Hamano	1	-0/+29
2013-06-20	pull: merge into unborn by fast-forwarding from empty tree	Thomas Rast	1	-0/+29
2013-03-28	t5520: use test_config to set/unset git config variables (leftover bits)	Ramkumar Ramachandra	1	-3/+3
2013-03-25	t5520: use test_config to set/unset git config variables	Yann Droneaud	1	-8/+4
2011-11-07	pull: introduce a pull.rebase option to enable --rebase	Ævar Arnfjörð Bjarmason	1	-2/+21
2011-03-25	pull: do not clobber untracked files on initial pull	Jeff King	1	-0/+11
2010-11-29	Use reflog in 'pull --rebase . foo'	Martin von Zweigbergk	1	-0/+7
2010-08-21	Merge branch 'en/rebase-against-rebase-fix'	Junio C Hamano	1	-0/+62
2010-08-12	pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches	Elijah Newren	1	-2/+2
2010-08-12	t5520-pull: Add testcases showing spurious conflicts from git pull --rebase	Elijah Newren	1	-0/+62
2010-05-31	tests: use "test_cmp", not "diff", when verifying the result	Gary V. Vaughan	1	-1/+1
2009-08-12	allow pull --rebase on branch yet to be born	Jeff King	1	-0/+11
2009-07-19	pull: support rebased upstream + fetch + pull --rebase	Santi Béjar	1	-3/+2
2009-07-19	t5520-pull: Test for rebased upstream + fetch + pull --rebase	Santi Béjar	1	-0/+14
2009-06-11	parse-remote: support default reflist in get_remote_merge_branch	Santi Béjar	1	-0/+14
2008-10-17	pull: allow "git pull origin $something:$current_branch" into an unborn branch	Junio C Hamano	1	-0/+12
2008-05-22	pull --rebase: exit early when the working directory is dirty	Johannes Schindelin	1	-0/+18
2008-01-26	pull --rebase: be cleverer with rebased upstream branches	Johannes Schindelin	1	-0/+17
2007-11-28	Teach 'git pull' about --rebase	Johannes Schindelin	1	-0/+22
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
2007-03-16	git-fetch, git-branch: Support local --track via a special remote '.'	Paolo Bonzini	1	-0/+24
2007-01-12	use 'init' instead of 'init-db' for shipped docs and tools	Nicolas Pitre	1	-1/+1
2006-11-16	git-pull: allow pulling into an empty repository	Linus Torvalds	1	-0/+33