org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	merge: detect delete/modechange conflict	Jeff King	2015-10-26
*	Merge branch 'kb/p4merge'	Junio C Hamano	2013-03-26
\|\
\| *	merge-one-file: force content conflict for "both sides added" case	Junio C Hamano	2013-03-25
\| *	git-merge-one-file: send "ERROR:" messages to stderr	Kevin Bracey	2013-03-25
\| *	git-merge-one-file: style cleanup	Kevin Bracey	2013-03-25
\| *	merge-one-file: remove stale comment	Junio C Hamano	2013-03-25
\| *	mergetools/p4merge: create a base if none available	Kevin Bracey	2013-03-13
* \|	git-merge-one-file: use a lowercase "usage:" string	David Aguilar	2013-02-24
\|/
*	Merge branch 'js/maint-merge-one-file-osx-expr'	Junio C Hamano	2011-10-13
\|\
\| *	merge-one-file: fix "expr: non-numeric argument"	Jay Soffian	2011-10-06
* \|	Merge branch 'jk/merge-one-file-working-tree'	Junio C Hamano	2011-05-06
\|\ \
\| * \|	merge-one-file: fix broken merges with alternate work trees	Jeff King	2011-04-29
\| \|/
* \|	build: propagate $DIFF to scripts	Junio C Hamano	2010-06-05
* \|	Do not use "diff" found on PATH while building and installing	Gary V. Vaughan	2010-05-31
\|/
*	Show usage string for 'git merge-one-file -h'	Jonathan Nieder	2009-11-10
*	Clarify kind of conflict in merge-one-file helper	Alex Riesen	2009-05-09
*	git-merge-one-file: fix longstanding stupid thinko	Junio C Hamano	2008-03-18
*	Support a merge with conflicting gitlink change	Junio C Hamano	2007-12-11
*	Fix merge-one-file for our-side-added/our-side-removed cases	Junio C Hamano	2007-07-08
*	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	2007-07-02
*	War on whitespace	Junio C Hamano	2007-06-07
*	Use git-merge-file in git-merge-one-file, too	Johannes Schindelin	2006-12-21
*	merge: loosen overcautious "working file will be lost" check.	Junio C Hamano	2006-10-27
*	Fix more typos, primarily in the code	Pavel Roskin	2006-07-10
*	Shell utilities: Guard against expr' magic tokens.	Mark Wooding	2006-04-13
*	trivial: remove the dots at the end of file names from merge-one-file	Alex Riesen	2006-01-05
*	git-merge-one: new merge world order.	Junio C Hamano	2005-12-07
*	git-merge-one-file: resurrect leading path creation.	Junio C Hamano	2005-12-06
*	merge-one-file: make sure we do not mismerge symbolic links.	Junio C Hamano	2005-12-02
*	merge-one-file: make sure we create the merged file.	Junio C Hamano	2005-12-02
*	git-merge-one-file: do not worry about 'rmdir -p' not removing directory.	Junio C Hamano	2005-12-01
*	merge-one-file: leave unmerged index entries upon automerge failure.	Linus Torvalds	2005-11-30
*	merge-one-file: use rmdir -p	Junio C Hamano	2005-11-20
*	merge-one-file: remove empty directories	Junio C Hamano	2005-11-19
*	merge-one-file: use empty- or common-base condintionally in two-stage merge.	Junio C Hamano	2005-11-11
*	merge-one-file: use common as base, instead of emptiness.	Junio C Hamano	2005-11-11
*	merge with /dev/null as base, instead of punting O==empty case	Junio C Hamano	2005-11-11
*	Big tool rename.	Junio C Hamano	2005-09-07