summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-one-file: compute empty blob object IDbrian m. carlson2018-05-021-1/+1
* scripts: use "git foo" not "git-foo"mf/no-dashed-subcommandsMichael Forney2017-08-071-4/+4
* Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-261-2/+1
|\
| * merge-one-file: use empty blob for add/add baseJeff King2016-02-221-2/+1
* | merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-261-0/+8
|/
* Merge branch 'kb/p4merge'Junio C Hamano2013-03-261-33/+28
|\
| * merge-one-file: force content conflict for "both sides added" caseJunio C Hamano2013-03-251-5/+2
| * git-merge-one-file: send "ERROR:" messages to stderrKevin Bracey2013-03-251-7/+7
| * git-merge-one-file: style cleanupKevin Bracey2013-03-251-9/+17
| * merge-one-file: remove stale commentJunio C Hamano2013-03-251-2/+0
| * mergetools/p4merge: create a base if none availableKevin Bracey2013-03-131-13/+5
* | git-merge-one-file: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
|/
* Merge branch 'js/maint-merge-one-file-osx-expr'Junio C Hamano2011-10-131-1/+1
|\
| * merge-one-file: fix "expr: non-numeric argument"Jay Soffian2011-10-061-1/+1
* | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-061-1/+6
|\ \
| * | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-1/+6
| |/
* | build: propagate $DIFF to scriptsJunio C Hamano2010-06-051-1/+1
* | Do not use "diff" found on PATH while building and installingGary V. Vaughan2010-05-311-1/+1
|/
* Show usage string for 'git merge-one-file -h'Jonathan Nieder2009-11-101-0/+12
* Clarify kind of conflict in merge-one-file helperAlex Riesen2009-05-091-2/+9
* git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano2008-03-181-2/+3
* Support a merge with conflicting gitlink changeJunio C Hamano2007-12-111-0/+4
* Fix merge-one-file for our-side-added/our-side-removed casesJunio C Hamano2007-07-081-4/+6
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-11/+11
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* Use git-merge-file in git-merge-one-file, tooJohannes Schindelin2006-12-211-1/+1
* merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-271-1/+15
* Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
* Shell utilities: Guard against expr' magic tokens.Mark Wooding2006-04-131-1/+1
* trivial: remove the dots at the end of file names from merge-one-fileAlex Riesen2006-01-051-2/+2
* git-merge-one: new merge world order.Junio C Hamano2005-12-071-16/+9
* git-merge-one-file: resurrect leading path creation.Junio C Hamano2005-12-061-2/+10
* merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano2005-12-021-0/+8
* merge-one-file: make sure we create the merged file.Junio C Hamano2005-12-021-1/+7
* git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano2005-12-011-1/+1
* merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds2005-11-301-5/+1
* merge-one-file: use rmdir -pJunio C Hamano2005-11-201-5/+1
* merge-one-file: remove empty directoriesJunio C Hamano2005-11-191-1/+6
* merge-one-file: use empty- or common-base condintionally in two-stage merge.Junio C Hamano2005-11-111-0/+6
* merge-one-file: use common as base, instead of emptiness.Junio C Hamano2005-11-111-2/+4
* merge with /dev/null as base, instead of punting O==empty caseJunio C Hamano2005-11-111-4/+16
* Big tool rename.Junio C Hamano2005-09-071-0/+88
View Lorry Controller Status