tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-10-29	pull: --ff-only should make it a noop when already-up-to-date	Junio C Hamano	1	-1/+15
2021-07-22	pull: fix handling of multiple heads	Elijah Newren	1	-1/+1
2021-07-22	pull: abort by default when fast-forwarding is not possible	Elijah Newren	1	-24/+24
2021-07-22	pull: make --rebase and --no-rebase override pull.ff=only	Elijah Newren	1	-2/+2
2021-07-20	pull: abort if --ff-only is given and fast-forwarding is impossible	Alex Henrie	1	-5/+5
2021-07-20	t7601: add tests of interactions with multiple merge heads and config	Elijah Newren	1	-0/+22
2021-07-20	t7601: test interaction of merge/rebase/fast-forward flags and options	Elijah Newren	1	-0/+182
2020-12-15	pull: display default warning only when non-ff	Felipe Contreras	1	-5/+61
2020-11-19	pull: colorize the hint about setting `pull.rebase`	Johannes Schindelin	1	-2/+5
2020-09-24	pull: don't warn if pull.ff has been set	Alex Henrie	1	-1/+20
2020-03-10	pull: warn if the user didn't say whether to rebase or to merge	Alex Henrie	1	-0/+38
2015-05-18	pull: make pull.ff=true override merge.ff	Paul Tan	1	-0/+8
2014-01-15	pull: add pull.ff configuration	David Aguilar	1	-0/+21
2013-07-29	many small typofixes	Ondřej Bílka	1	-1/+1
2013-04-12	Correct common spelling mistakes in comments and tests	Stefano Lattarini	1	-1/+1
2010-10-06	t7601 (merge-pull-config): add missing &&	Elijah Newren	1	-6/+6
2008-09-03	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	1	-1/+1
2008-07-23	t7601: extend the 'merge picks up the best result' test	Miklos Vajna	1	-0/+15
2008-07-21	builtin-merge: give a proper error message for invalid strategies in config	Miklos Vajna	1	-0/+12
2008-07-06	Fix t7601-merge-pull-config.sh on AIX	Miklos Vajna	1	-7/+7
2008-06-30	Add new test to ensure git-merge handles pull.twohead and pull.octopus	Miklos Vajna	1	-0/+129