diff options
| author |  Petr Baudis <pasky@ucw.cz> | 2005-06-08 23:26:55 +0200 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 15:54:45 -0700 |
| commit | 8544a6f1b8e7340924c406d717ac37becd2f6046 (patch) | |
| tree | c5a0b446a265a28ebfccee6a874fad2386678d2b /unpack-file.c | |
| parent | Remove MERGE_HEAD after committing merge (diff) | |
| download | tgif-8544a6f1b8e7340924c406d717ac37becd2f6046.tar.xz | |
[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>
Diffstat (limited to 'unpack-file.c')
0 files changed, 0 insertions, 0 deletions