git - git

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