summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Tor Arvid Lund <torarvid@gmail.com>2011-03-15 13:08:02 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-15 16:07:15 -0700
commitd53de8b97de9d3c037c873cd8e01041cf9d51a39 (patch)
tree5511e39913a8f21cc3903c1d6519e53e12537da3 /xdiff/xmerge.c
parentgit-p4: Teach gitConfig method about arguments. (diff)
downloadtgif-d53de8b97de9d3c037c873cd8e01041cf9d51a39.tar.xz
Teach git-p4 to ignore case in perforce filenames if configured.
When files are added to perforce, the path to that file has whichever case configuration that exists on the machine of the user who added the file. What does that mean? It means that when Alice adds a file //depot/DirA/FileA.txt ... and Bob adds: //depot/dirA/FileB.txt ... we may or may not get a problem. If a user sets the config variable git-p4.ignorecase to "true", we will consider //depot/DirA and //depot/dirA to be the same directory. Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions