summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Max Horn <max@quendi.de>2013-01-15 14:02:39 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-15 10:01:11 -0800
commit3968e302f8d09104da9ede15079f1133df6d3b68 (patch)
tree0ff02242dfd67928840d7a3aea5fca323c99445d /Documentation/git-merge.txt
parentSync with 1.8.1.1 (diff)
downloadtgif-3968e302f8d09104da9ede15079f1133df6d3b68.tar.xz
remote-hg: fix handling of file perms when pushing
Previously, when changing and committing an executable file, the file would loose its executable bit on the hg side. Likewise, symlinks ended up as "normal" files". This was not immediately apparent on the git side unless one did a fresh clone. Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions