tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2018-02-16	merge: allow fast-forward when merging a tracked tag	Junio C Hamano	1	-1/+2
2017-11-06	Merge branch 'wk/pull-signoff'	Junio C Hamano	1	-0/+10
2017-10-19	Merge branch 'wk/merge-options-gpg-sign-doc'	Junio C Hamano	1	-0/+6
2017-10-13	pull: pass --signoff/--no-signoff to "git merge"	W. Trevor King	1	-0/+10
2017-10-12	Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'	W. Trevor King	1	-0/+6
2017-08-23	treewide: correct several "up-to-date" to "up to date"	Martin Ågren	1	-1/+1
2016-05-17	Merge branch 'kf/gpg-sig-verification-doc'	Junio C Hamano	1	-2/+5
2016-05-13	Documentation: clarify signature verification	Keller Fuchs	1	-2/+5
2016-04-21	pull: pass --allow-unrelated-histories to "git merge"	Junio C Hamano	1	-0/+8
2014-03-31	Documentation: fix misuses of "nor"	Justin Lebar	1	-8/+7
2014-01-27	Merge branch 'jc/maint-pull-docfix'	Junio C Hamano	1	-3/+6
2014-01-14	Documentation: "git pull" does not have the "-m" option	Junio C Hamano	1	-3/+6
2013-06-02	Merge branch 'rh/merge-options-doc-fix'	Junio C Hamano	1	-1/+2
2013-05-16	Documentation/merge-options.txt: restore `-e` option	Richard Hansen	1	-1/+2
2013-04-05	Merge branch 'sg/gpg-sig'	Junio C Hamano	1	-0/+5
2013-03-31	merge/pull Check for untrusted good GPG signatures	Sebastian Götte	1	-2/+2
2013-03-31	merge/pull: verify GPG signatures of commits being merged	Sebastian Götte	1	-0/+5
2013-03-21	Documentation: merging a tag is a special case	Junio C Hamano	1	-1/+2
2012-02-26	Merge branch 'jc/doc-merge-options'	Junio C Hamano	1	-11/+11
2012-02-22	Documentation/merge-options.txt: group "ff" related options together	Junio C Hamano	1	-11/+11
2012-01-23	merge: use editor by default in interactive sessions	Junio C Hamano	1	-3/+13
2011-12-05	Documentation: fix formatting error in merge-options.txt	Jack Nagel	1	-1/+0
2011-10-12	Teach merge the '[-e\|--edit]' option	Jay Soffian	1	-0/+6
2011-02-21	merge: enable progress reporting for rename detection	Jeff King	1	-1/+9
2010-09-09	merge: Make '--log' an integer option for number of shortlog entries	Ramkumar Ramachandra	1	-3/+3
2010-04-13	Merge branch 'maint'	Junio C Hamano	1	-5/+5
2010-04-12	Docs: Add -X option to git-merge's synopsis.	Marc Branchaud	1	-5/+5
2010-02-24	Documentation/git-pull: put verbosity options before merge/fetch ones	Tay Ray Chuan	1	-0/+2
2010-01-20	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	1	-0/+5
2010-01-17	Document that merge strategies can now take their own options	Junio C Hamano	1	-0/+5
2010-01-10	Documentation: spell 'git cmd' without dash throughout	Thomas Rast	1	-2/+2
2009-11-10	Merge branch 'bg/merge-ff-only'	Junio C Hamano	1	-0/+5
2009-10-30	Teach 'git merge' and 'git pull' the option --ff-only	Björn Gustavsson	1	-0/+5
2009-10-22	Documentation/merge-options.txt: order options in alphabetical groups	Jari Aalto	1	-43/+45
2009-05-25	merge-options.txt: Clarify merge --squash	Michael J Gruber	1	-1/+2
2008-12-09	Improve language in git-merge.txt and related docs	Ralf Wildenhues	1	-1/+1
2008-11-14	Teach/Fix pull/fetch -q/-v options	Tuncer Ayaz	1	-0/+8
2008-07-05	manpages: italicize git command names (which were in teletype font)	Jonathan Nieder	1	-2/+2
2008-06-08	Docs: Use "-l::\n--long\n" format in OPTIONS sections	Stephan Beyer	1	-3/+6
2008-04-12	merge, pull: add '--(no-)log' command line option	SZEDER Gábor	1	-0/+9
2008-04-12	add 'merge.stat' config variable	SZEDER Gábor	1	-1/+1
2008-04-12	merge, pull: introduce '--(no-)stat' option	SZEDER Gábor	1	-2/+6
2007-09-23	git-merge: add --ff and --no-ff options	Lars Hjemli	1	-0/+9
2007-09-23	git-merge: add support for --commit and --no-squash	Lars Hjemli	1	-0/+8
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
2007-05-24	Add a configuration option to control diffstat after merge	Alex Riesen	1	-0/+4
2006-06-24	git-merge --squash	Junio C Hamano	1	-0/+8
2005-12-08	Documentation: recursive is the default strategy these days.	Junio C Hamano	1	-1/+1
2005-11-06	Refactored merge options into separate merge-options.txt.	Jon Loeliger	1	-0/+16