]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7f1d112) | patch
[PATCH] Fix git-merge-one-file permissions auto-merging
authorPetr Baudis <pasky@ucw.cz>
Wed, 8 Jun 2005 21:26:55 +0000 (23:26 +0200)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 22:54:45 +0000 (15:54 -0700)
commit8544a6f1b8e7340924c406d717ac37becd2f6046
treec5a0b446a265a28ebfccee6a874fad2386678d2btree | snapshot
parent7f1d1129628c63f46aebe03afacdb2ab259ef2d6commit | diff
[PATCH] Fix git-merge-one-file permissions auto-merging

In the automerge case, permissions were not restored properly after the
merge tool was invoked and overwrote the target file.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
git-merge-one-file-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.