summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
AgeCommit message (Expand)AuthorFilesLines
2016-02-26Merge branch 'jk/no-diff-emit-common'Libravatar Junio C Hamano1-2/+1
2016-02-22merge-one-file: use empty blob for add/add baseLibravatar Jeff King1-2/+1
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King1-0/+8
2013-03-26Merge branch 'kb/p4merge'Libravatar Junio C Hamano1-33/+28
2013-03-25merge-one-file: force content conflict for "both sides added" caseLibravatar Junio C Hamano1-5/+2
2013-03-25git-merge-one-file: send "ERROR:" messages to stderrLibravatar Kevin Bracey1-7/+7
2013-03-25git-merge-one-file: style cleanupLibravatar Kevin Bracey1-9/+17
2013-03-25merge-one-file: remove stale commentLibravatar Junio C Hamano1-2/+0
2013-03-13mergetools/p4merge: create a base if none availableLibravatar Kevin Bracey1-13/+5
2013-02-24git-merge-one-file: use a lowercase "usage:" stringLibravatar David Aguilar1-1/+1
2011-10-13Merge branch 'js/maint-merge-one-file-osx-expr'Libravatar Junio C Hamano1-1/+1
2011-10-06merge-one-file: fix "expr: non-numeric argument"Libravatar Jay Soffian1-1/+1
2011-05-06Merge branch 'jk/merge-one-file-working-tree'Libravatar Junio C Hamano1-1/+6
2011-04-29merge-one-file: fix broken merges with alternate work treesLibravatar Jeff King1-1/+6
2010-06-05build: propagate $DIFF to scriptsLibravatar Junio C Hamano1-1/+1
2010-05-31Do not use "diff" found on PATH while building and installingLibravatar Gary V. Vaughan1-1/+1
2009-11-10Show usage string for 'git merge-one-file -h'Libravatar Jonathan Nieder1-0/+12
2009-05-09Clarify kind of conflict in merge-one-file helperLibravatar Alex Riesen1-2/+9
2008-03-18git-merge-one-file: fix longstanding stupid thinkoLibravatar Junio C Hamano1-2/+3
2007-12-11Support a merge with conflicting gitlink changeLibravatar Junio C Hamano1-0/+4
2007-07-08Fix merge-one-file for our-side-added/our-side-removed casesLibravatar Junio C Hamano1-4/+6
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-11/+11
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+1
2006-12-21Use git-merge-file in git-merge-one-file, tooLibravatar Johannes Schindelin1-1/+1
2006-10-27merge: loosen overcautious "working file will be lost" check.Libravatar Junio C Hamano1-1/+15
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-04-13Shell utilities: Guard against expr' magic tokens.Libravatar Mark Wooding1-1/+1
2006-01-05trivial: remove the dots at the end of file names from merge-one-fileLibravatar Alex Riesen1-2/+2
2005-12-07git-merge-one: new merge world order.Libravatar Junio C Hamano1-16/+9
2005-12-06git-merge-one-file: resurrect leading path creation.Libravatar Junio C Hamano1-2/+10
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Libravatar Junio C Hamano1-0/+8
2005-12-02merge-one-file: make sure we create the merged file.Libravatar Junio C Hamano1-1/+7
2005-12-01git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Libravatar Junio C Hamano1-1/+1
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Libravatar Linus Torvalds1-5/+1
2005-11-20merge-one-file: use rmdir -pLibravatar Junio C Hamano1-5/+1
2005-11-19merge-one-file: remove empty directoriesLibravatar Junio C Hamano1-1/+6
2005-11-11merge-one-file: use empty- or common-base condintionally in two-stage merge.Libravatar Junio C Hamano1-0/+6
2005-11-11merge-one-file: use common as base, instead of emptiness.Libravatar Junio C Hamano1-2/+4
2005-11-11merge with /dev/null as base, instead of punting O==empty caseLibravatar Junio C Hamano1-4/+16
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+88
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:28:14 +0000