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

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