git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bb12ac5)
merge-recursive: handle file mode changes
authorClemens Buchacher <redacted>
Thu, 13 Mar 2008 22:47:41 +0000 (23:47 +0100)
committerJunio C Hamano <redacted>
Fri, 14 Mar 2008 06:41:16 +0000 (23:41 -0700)
commit1affea4f629537fd48e3bd66de89a6f45d0fcd82
treefa0a6eab955f3c558906b2c90339dc0794536ce4tree | snapshot
parentbb12ac5120b657691b71108cef3e586ba0b76af6commit | diff
merge-recursive: handle file mode changes

File mode changes should be handled similarly to changes of content.
That is, if the file mode changed in only one branch, keep the changed
version, and if both branch changed to different mode, mark it as a
conflict.

Signed-off-by: Clemens Buchacher <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
t/t6031-merge-recursive.sh [new file with mode: 0755] blob
git clone https://git.99rst.org/PROJECT