summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-03-03 21:34:14 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-03 21:36:38 -0800
commit473d404b53488a17458beea81913c1bc5df47a8a (patch)
tree0324bfaef8a82f91e83170898e1325e1227937c9 /Documentation/merge-options.txt
parentread-tree --aggressive: remove deleted entry from the working tree. (diff)
downloadtgif-473d404b53488a17458beea81913c1bc5df47a8a.tar.xz
tar-tree: file/dirmode fix.
This fixes two bugs introduced when we switched to generic tree traversal code. (1) directory mode recorded silently became 0755, not 0777 (2) if passed a tree object (not a commit), it emitted an alarming error message (but proceeded anyway). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions