tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2008-12-09	Improve language in git-merge.txt and related docs	Ralf Wildenhues	1	-17/+17
2008-09-29	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	1	-0/+65
2008-09-04	Fix AsciiDoc errors in merge documentation	Johan Herland	1	-4/+4
2008-08-31	git-merge documentation: describe how conflict is presented	Junio C Hamano	1	-0/+65
2008-08-22	git-merge documentation: more details about resolving conflicts	Dan Hensgen	1	-6/+18
2008-07-30	Make the DESCRIPTION match <x>... items in the SYNOPSIS	Abhijit Menon-Sen	1	-2/+2
2008-07-21	Update my e-mail address	Junio C Hamano	1	-1/+1
2008-07-19	Documentation/git-merge.txt: Partial rewrite of How Merge Works	Petr Baudis	1	-47/+29
2008-07-08	Documentation: mention ORIG_HEAD in am, merge, and rebase	Brian Gernhardt	1	-1/+3
2008-07-05	manpages: italicize git command names (which were in teletype font)	Jonathan Nieder	1	-8/+8
2008-07-01	Documentation formatting and cleanup	Jonathan Nieder	1	-6/+8
2008-07-01	Documentation: be consistent about "git-" versus "git "	Jonathan Nieder	1	-5/+5
2008-06-06	documentation: move git(7) to git(1)	Christian Couder	1	-1/+1
2008-04-12	merge, pull: introduce '--(no-)stat' option	SZEDER Gábor	1	-1/+1
2008-04-12	doc: moved merge.* config variables into separate merge-config.txt	SZEDER Gábor	1	-12/+1
2008-03-03	Fix incorrect wording in git-merge.txt.	Matthieu Moy	1	-1/+2
2008-01-16	Documentation: fix and clarify grammar in git-merge docs.	Dave Peticolas	1	-6/+6
2008-01-06	Documentation: rename gitlink macro to linkgit	Dan McGee	1	-4/+4
2007-12-22	Documentation: describe 'union' low-level merge driver	Junio C Hamano	1	-1/+2
2007-10-30	Merge branch 'maint' into HEAD	Junio C Hamano	1	-5/+6
2007-10-30	git-merge: document but discourage the historical syntax	Junio C Hamano	1	-5/+6
2007-10-03	Merge branch 'lh/merge'	Junio C Hamano	1	-0/+4
2007-09-25	Fix spelling of overridden in documentation	Shawn Bohrer	1	-1/+1
2007-09-23	git-merge: add support for branch.<name>.mergeoptions	Lars Hjemli	1	-0/+4
2007-08-01	Try to be consistent with capitalization in the documentation	Steve Hoelzer	1	-5/+5
2007-07-12	Update git-merge documentation.	Jakub Narebski	1	-0/+15
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+1
2007-05-24	Add a configuration option to control diffstat after merge	Alex Riesen	1	-1/+1
2007-02-17	Convert update-index references in docs to add.	Shawn O. Pearce	1	-1/+1
2007-02-12	git merge documentation: -m is optional	Matthias Lederhofer	1	-1/+1
2007-01-18	Documentation: sync git.txt command list and manual page title	Junio C Hamano	1	-1/+1
2006-12-28	Use GIT_REFLOG_ACTION environment variable instead.	Shawn O. Pearce	1	-6/+0
2006-11-21	git-merge: make it usable as the first class UI	Junio C Hamano	1	-5/+13
2006-07-09	Assorted typo fixes	Pavel Roskin	1	-1/+1
2005-12-16	Examples of resetting.	Junio C Hamano	1	-0/+5
2005-12-02	git-merge documentation: conflicting merge leaves higher stages in index	Junio C Hamano	1	-4/+6
2005-11-28	Documentation: Describe merge operation a bit better.	Junio C Hamano	1	-0/+95
2005-11-06	Refactored merge options into separate merge-options.txt.	Jon Loeliger	1	-1/+1
2005-11-06	Refactor merge strategies into separate includable file.	Jon Loeliger	1	-0/+2
2005-11-05	Documentation: git-fetch/pull updates.	Junio C Hamano	1	-1/+1
2005-11-04	Documentation: -merge and -pull: describe merge strategies.	Junio C Hamano	1	-9/+2
2005-11-01	Documentation for git-fmt-merge-msg	Petr Baudis	1	-0/+10
2005-10-10	Remove the version tags from the manpages	Junio C Hamano	1	-1/+0
2005-09-20	[PATCH] Documentation: Update all files to use the new gitlink: macro	Sergey Vlasov	1	-1/+1
2005-09-10	'git-merge': Documentation.	Junio C Hamano	1	-0/+52