projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 857f26d) | patch
merge-recursive: Use '~' instead of '_' to separate file names from branch names
authorFredrik Kuivinen <freku045@student.liu.se>
Fri, 11 Nov 2005 23:55:36 +0000 (00:55 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:14:39 +0000 (21:14 -0800)
commite9af60c88bbd152ad04640ddb93dc927fc7a10b6
tree9440e9d9198a80e89ca9fdccd5fb97f033d842c6tree | snapshot
parent857f26d2f41e16170e48076758d974820af685ffcommit | diff
merge-recursive: Use '~' instead of '_' to separate file names from branch names

Makes it less probable that we get a clash with an existing file,
furthermore Cogito already uses '~' for this purpose.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py diff | blob | history
The core git plumbing