summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-5-1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:20 -0700
commit87a684fc531f1685fefdfbe871ac590760e892df (patch)
treed8748ae8f55ef144a39270735b71c5ff301ebde4 /t/t4252/am-test-5-1
parentMerge branch 'ms/tagname-does-not-begin-with-dash' (diff)
parentgit-p4: warn if git authorship won't be retained (diff)
downloadtgif-87a684fc531f1685fefdfbe871ac590760e892df.tar.xz
Merge branch 'ld/p4-preserve-user-names'
* ld/p4-preserve-user-names: git-p4: warn if git authorship won't be retained git-p4: small improvements to user-preservation git-p4: add option to preserve user names
Diffstat (limited to 't/t4252/am-test-5-1')
0 files changed, 0 insertions, 0 deletions