summaryrefslogtreecommitdiff
path: root/cat-file.c
diff options
context:
space:
mode:
authorLibravatar Yaacov Akiba Slama <ya@slamail.org>2005-11-02 23:51:57 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-08 01:24:49 -0800
commit109fc2b97b73090a4a0a6550cdf9b2446fd12389 (patch)
tree31b3106cec54086acf51c2868948792b3b6c8054 /cat-file.c
parentcopy_dir becomes copy_path and handles both files and directories (diff)
downloadtgif-109fc2b97b73090a4a0a6550cdf9b2446fd12389.tar.xz
Bundle file copies from multiple branches into a merge.
When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cat-file.c')
0 files changed, 0 insertions, 0 deletions