path: root/
AgeCommit message (Expand)Author
2018-05-02merge-one-file: compute empty blob object IDbrian m. carlson
2017-08-07scripts: use "git foo" not "git-foo"Michael Forney
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano
2016-02-23merge-one-file: use empty blob for add/add baseJeff King
2015-10-26merge: detect delete/modechange conflictJeff King
2013-03-26Merge branch 'kb/p4merge'Junio C Hamano
2013-03-25merge-one-file: force content conflict for "both sides added" caseJunio C Hamano
2013-03-25git-merge-one-file: send "ERROR:" messages to stderrKevin Bracey
2013-03-25git-merge-one-file: style cleanupKevin Bracey
2013-03-25merge-one-file: remove stale commentJunio C Hamano
2013-03-13mergetools/p4merge: create a base if none availableKevin Bracey
2013-02-24git-merge-one-file: use a lowercase "usage:" stringDavid Aguilar
2011-10-14Merge branch 'js/maint-merge-one-file-osx-expr'Junio C Hamano
2011-10-06merge-one-file: fix "expr: non-numeric argument"Jay Soffian
2011-05-06Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano
2011-04-29merge-one-file: fix broken merges with alternate work treesJeff King
2010-06-05build: propagate $DIFF to scriptsJunio C Hamano
2010-05-31Do not use "diff" found on PATH while building and installingGary V. Vaughan
2009-11-10Show usage string for 'git merge-one-file -h'Jonathan Nieder
2009-05-09Clarify kind of conflict in merge-one-file helperAlex Riesen
2008-03-19git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano
2007-12-11Support a merge with conflicting gitlink changeJunio C Hamano
2007-07-09Fix merge-one-file for our-side-added/our-side-removed casesJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2006-12-22Use git-merge-file in git-merge-one-file, tooJohannes Schindelin
2006-10-28merge: loosen overcautious "working file will be lost" check.Junio C Hamano
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-04-13Shell utilities: Guard against expr' magic tokens.Mark Wooding
2006-01-06trivial: remove the dots at the end of file names from merge-one-fileAlex Riesen
2005-12-07git-merge-one: new merge world order.Junio C Hamano
2005-12-06git-merge-one-file: resurrect leading path creation.Junio C Hamano
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano
2005-12-02merge-one-file: make sure we create the merged file.Junio C Hamano
2005-12-02git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds
2005-11-20merge-one-file: use rmdir -pJunio C Hamano
2005-11-20merge-one-file: remove empty directoriesJunio C Hamano
2005-11-12merge-one-file: use empty- or common-base condintionally in two-stage merge.Junio C Hamano
2005-11-12merge-one-file: use common as base, instead of emptiness.Junio C Hamano
2005-11-12merge with /dev/null as base, instead of punting O==empty caseJunio C Hamano
2005-09-08Big tool rename.Junio C Hamano