summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-06-30 22:18:19 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-05 12:11:33 -0700
commit334fba656b50c92345586970bc6b100a449e1fc5 (patch)
treed4d396eb7aa3f04ea616506bf67b486a11df6045 /builtin/merge-file.c
parentGit 1.7.2-rc1 (diff)
downloadtgif-334fba656b50c92345586970bc6b100a449e1fc5.tar.xz
Teach fast-import to import subtrees named by tree id
To simulate the svn cp command, it would be very useful to be replace an arbitrary file in the current revision by an arbitrary directory from a previous one. Modify the filemodify command to allow that: M 040000 <tree id> pathname This would be most useful in combination with a facility to print the commit ids for new revisions as they are written. Cc: Shawn O. Pearce <spearce@spearce.org> Cc: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions