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