Sign in
googlers
/
jrn
/
git
/
5e65dac9c88d02f569cc87cdf630ecb5a780c6a6
/
git-merge-one-file.sh
7882fa2
merge-one-file: compute empty blob object ID
by brian m. carlson
· 7 years ago
974ce80
scripts: use "git foo" not "git-foo"
by Michael Forney
· 7 years ago
18b26b1
Merge branch 'jk/no-diff-emit-common'
by Junio C Hamano
· 9 years ago
1a92e53
merge-one-file: use empty blob for add/add base
by Jeff King
· 9 years ago
72fac66
merge: detect delete/modechange conflict
by Jeff King
· 9 years ago
183f880
Merge branch 'kb/p4merge'
by Junio C Hamano
· 12 years ago
4fa5c05
merge-one-file: force content conflict for "both sides added" case
by Junio C Hamano
· 12 years ago
d401acf
git-merge-one-file: send "ERROR:" messages to stderr
by Kevin Bracey
· 12 years ago
333ea38
git-merge-one-file: style cleanup
by Kevin Bracey
· 12 years ago
530333c
merge-one-file: remove stale comment
by Junio C Hamano
· 12 years ago
4549162
mergetools/p4merge: create a base if none available
by Kevin Bracey
· 12 years ago
e5a1518
git-merge-one-file: use a lowercase "usage:" string
by David Aguilar
· 12 years ago
b73c683
Merge branch 'js/maint-merge-one-file-osx-expr'
by Junio C Hamano
· 13 years ago
d30db56
merge-one-file: fix "expr: non-numeric argument"
by Jay Soffian
· 13 years ago
ac13e7c
Merge branch 'jk/merge-one-file-working-tree'
by Junio C Hamano
· 14 years ago
6aaeca9
merge-one-file: fix broken merges with alternate work trees
by Jeff King
· 14 years ago
09ce4bb
build: propagate $DIFF to scripts
by Junio C Hamano
· 15 years ago
d1b1a91
Do not use "diff" found on PATH while building and installing
by Gary V. Vaughan
· 15 years ago
ae5bdda
Show usage string for 'git merge-one-file -h'
by Jonathan Nieder
· 15 years ago
718135e
Clarify kind of conflict in merge-one-file helper
by Alex Riesen
· 16 years ago
29dc133
git-merge-one-file: fix longstanding stupid thinko
by Junio C Hamano
· 17 years ago
ff72af0
Support a merge with conflicting gitlink change
by Junio C Hamano
· 17 years ago
561b0fb
Fix merge-one-file for our-side-added/our-side-removed cases
by Junio C Hamano
· 18 years ago
5be6007
Rewrite "git-frotz" to "git frotz"
by Junio C Hamano
· 18 years ago
a6080a0
War on whitespace
by Junio C Hamano
· 18 years ago
caba139
Use git-merge-file in git-merge-one-file, too
by Johannes Schindelin
· 18 years ago
ed93b44
merge: loosen overcautious "working file will be lost" check.
by Junio C Hamano
· 18 years ago
82e5a82
Fix more typos, primarily in the code
by Pavel Roskin
· 19 years ago
f327dbc
Shell utilities: Guard against expr' magic tokens.
by Mark Wooding
· 19 years ago
31f883d
trivial: remove the dots at the end of file names from merge-one-file
by Alex Riesen
· 19 years ago
b539c5e
git-merge-one: new merge world order.
by Junio C Hamano
· 19 years ago
be61db9
git-merge-one-file: resurrect leading path creation.
by Junio C Hamano
· 19 years ago
54dd99a
merge-one-file: make sure we do not mismerge symbolic links.
by Junio C Hamano
· 19 years ago
1c2c10b
merge-one-file: make sure we create the merged file.
by Junio C Hamano
· 19 years ago
ce3ca27
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
by Junio C Hamano
· 19 years ago
354b9b5
merge-one-file: leave unmerged index entries upon automerge failure.
by Linus Torvalds
· 19 years ago
9ae2172
merge-one-file: use rmdir -p
by Junio C Hamano
· 19 years ago
397c766
merge-one-file: remove empty directories
by Junio C Hamano
· 19 years ago
fd66dbf
merge-one-file: use empty- or common-base condintionally in two-stage merge.
by Junio C Hamano
· 19 years ago
cb93c19
merge-one-file: use common as base, instead of emptiness.
by Junio C Hamano
· 19 years ago
f7d24bb
merge with /dev/null as base, instead of punting O==empty case
by Junio C Hamano
· 19 years ago
215a7ad
Big tool rename.
by Junio C Hamano
· 19 years ago
[Renamed (81%) from git-merge-one-file-script]
cdcb0ed
[PATCH] Make "git resolve" less scary
by Linus Torvalds
· 19 years ago
0b124bb
[PATCH] Trivial tidyups
by Petr Baudis
· 19 years ago
aacc15e
[PATCH] git-merge-one-file-script: do not misinterpret rm failure.
by Junio C Hamano
· 20 years ago
98a96b0
One more time.. Clean up git-merge-one-file-script
by Linus Torvalds
· 20 years ago
e0226ad
Fix up git-merge-one-file-script
by Linus Torvalds
· 20 years ago
566487c
Merge my and Petr's git-merge-one-file-script modifications
by Linus Torvalds
· 20 years ago
ec73962
[PATCH] git-merge-one-file-script cleanups from Cogito
by Petr Baudis
· 20 years ago
ae3858e
Make sure we error out if we can't remove a file on automatic merges.
by Linus Torvalds
· 20 years ago
8544a6f
[PATCH] Fix git-merge-one-file permissions auto-merging
by Petr Baudis
· 20 years ago
2a68a86
Leave merge failures in the filesystem
by Linus Torvalds
· 20 years ago
c7d1d4e
Use backticks in git-merge-one-file-script instead of $(command).
by Junio C Hamano
· 20 years ago
ee28152
Update git-merge-one-file-script.
by Junio C Hamano
· 20 years ago
21a08dc
[PATCH] Really fix git-merge-one-file-script this time.
by Junio C Hamano
· 20 years ago
0fc65a4
[PATCH] leftover bits for git rename
by Junio C Hamano
· 20 years ago
2d280e1
Update the merge scripts for the big git rename.
by Linus Torvalds
· 20 years ago
e2b6a9d
[PATCH] make file merging respect permissions
by James Bottomley
· 20 years ago
0a9ea85
[PATCH] SCSI trees, merges and git status
by James Bottomley
· 20 years ago
e3b4be7
Change merge-cache and git-merge-one-file to use the SHA1 of the file
by Linus Torvalds
· 20 years ago
839a7a0
Add the simple scripts I used to do a merge with content conflicts.
by Linus Torvalds
· 20 years ago