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