summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2011-05-13 20:46:00 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-13 12:59:13 -0700
commit848de9c3831f7e476ea58e3ee426aa63fb8f6870 (patch)
treec6d80ef1b5068833d20a1232a5e274d1578bfd34 /t/t6035-merge-dir-to-symlink.sh
parentgit-p4: small improvements to user-preservation (diff)
downloadtgif-848de9c3831f7e476ea58e3ee426aa63fb8f6870.tar.xz
git-p4: warn if git authorship won't be retained
If the git commits you are submitting contain changes made by other people, the authorship will not be retained. Change git-p4 to warn of this and to note that --preserve-user can be used to solve the problem (if you have suitable permissions). The warning can be disabled. Add a test case and update documentation. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6035-merge-dir-to-symlink.sh')
0 files changed, 0 insertions, 0 deletions