Commit Graph

42 Commits (master)

Author SHA1 Message Date
brian m. carlson 7882fa220c merge-one-file: compute empty blob object ID 4 years ago
Michael Forney 974ce8078c scripts: use "git foo" not "git-foo" 5 years ago
Jeff King 1a92e53ba3 merge-one-file: use empty blob for add/add base 7 years ago
Jeff King 72fac66bca merge: detect delete/modechange conflict 7 years ago
Junio C Hamano 4fa5c0591a merge-one-file: force content conflict for "both sides added" case 10 years ago
Kevin Bracey d401acf703 git-merge-one-file: send "ERROR:" messages to stderr 10 years ago
Kevin Bracey 333ea38db9 git-merge-one-file: style cleanup 10 years ago
Junio C Hamano 530333cfe8 merge-one-file: remove stale comment 10 years ago
Kevin Bracey 4549162e8d mergetools/p4merge: create a base if none available 10 years ago
David Aguilar e5a1518ef4 git-merge-one-file: use a lowercase "usage:" string 10 years ago
Jay Soffian d30db5605b merge-one-file: fix "expr: non-numeric argument" 11 years ago
Jeff King 6aaeca900b merge-one-file: fix broken merges with alternate work trees 12 years ago
Junio C Hamano 09ce4bb6ea build: propagate $DIFF to scripts 12 years ago
Gary V. Vaughan d1b1a91946 Do not use "diff" found on PATH while building and installing 12 years ago
Jonathan Nieder ae5bdda36c Show usage string for 'git merge-one-file -h' 13 years ago
Alex Riesen 718135e3b6 Clarify kind of conflict in merge-one-file helper 14 years ago
Alex Riesen adfd55d51b Clarify kind of conflict in merge-one-file helper 14 years ago
Junio C Hamano 29dc133198 git-merge-one-file: fix longstanding stupid thinko 15 years ago
Junio C Hamano ff72af00f8 Support a merge with conflicting gitlink change 15 years ago
Junio C Hamano 561b0fbb4a Fix merge-one-file for our-side-added/our-side-removed cases 15 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 15 years ago
Junio C Hamano a6080a0a44 War on whitespace 16 years ago
Johannes Schindelin caba139d43 Use git-merge-file in git-merge-one-file, too 16 years ago
Junio C Hamano ed93b449c5 merge: loosen overcautious "working file will be lost" check. 16 years ago
Pavel Roskin 82e5a82fd7 Fix more typos, primarily in the code 16 years ago
Mark Wooding f327dbced2 Shell utilities: Guard against expr' magic tokens. 17 years ago
Alex Riesen 31f883d1b8 trivial: remove the dots at the end of file names from merge-one-file 17 years ago
Junio C Hamano b539c5e8fb git-merge-one: new merge world order. 17 years ago
Junio C Hamano be61db922a git-merge-one-file: resurrect leading path creation. 17 years ago
Junio C Hamano 54dd99a127 merge-one-file: make sure we do not mismerge symbolic links. 17 years ago
Junio C Hamano 1c2c10b6e6 merge-one-file: make sure we create the merged file. 17 years ago
Junio C Hamano ce3ca27545 git-merge-one-file: do not worry about 'rmdir -p' not removing directory. 17 years ago
Linus Torvalds 354b9b59b0 merge-one-file: leave unmerged index entries upon automerge failure. 17 years ago
Junio C Hamano 9ae2172aed merge-one-file: use rmdir -p 17 years ago
Junio C Hamano 397c76697f merge-one-file: remove empty directories 17 years ago
Junio C Hamano fd66dbf529 merge-one-file: use empty- or common-base condintionally in two-stage merge. 17 years ago
Junio C Hamano cb93c19365 merge-one-file: use common as base, instead of emptiness. 17 years ago
Junio C Hamano f7d24bbefb merge with /dev/null as base, instead of punting O==empty case 17 years ago
Junio C Hamano 215a7ad1ef Big tool rename. 17 years ago
Linus Torvalds cdcb0ed411 [PATCH] Make "git resolve" less scary 17 years ago
Petr Baudis 0b124bb4bf [PATCH] Trivial tidyups 17 years ago
Junio C Hamano aacc15ec52 [PATCH] git-merge-one-file-script: do not misinterpret rm failure. 18 years ago
Linus Torvalds 98a96b00b8 One more time.. Clean up git-merge-one-file-script 18 years ago
Linus Torvalds e0226add28 Fix up git-merge-one-file-script 18 years ago
Petr Baudis ec73962d8e [PATCH] git-merge-one-file-script cleanups from Cogito 18 years ago
Linus Torvalds ae3858e7e9 Make sure we error out if we can't remove a file on automatic merges. 18 years ago
Petr Baudis 8544a6f1b8 [PATCH] Fix git-merge-one-file permissions auto-merging 18 years ago
Linus Torvalds 2a68a8659f Leave merge failures in the filesystem 18 years ago
Junio C Hamano c7d1d4e1b5 Use backticks in git-merge-one-file-script instead of $(command). 18 years ago
Junio C Hamano ee28152d03 Update git-merge-one-file-script. 18 years ago