Experimental Physics and
Industrial Control System

On 11/18/20 7:56 AM, Zimoch Dirk (PSI) via Core-talk wrote:
> Will git be able to handle files that have been moved to a different path?

Most of the time, yes.  Though there can be confusion
when eg. both a move and a rename are detected.
Some of the osd*.c files do this.

Before merging you will probably want to set:

> git config --global diff.renameLimit 0

This overrides a conservative default intended to speed
up merges of very large projects (aka. the linux kernel).
I've never had noticed this with Base.

cf. 'man git-config'

Replies:

AW: another git question Zimoch Dirk (PSI) via Core-talk

References:

another git question Zimoch Dirk (PSI) via Core-talk

Navigate by Date:

Prev: Re: another git question Konrad, Martin via Core-talk

Next: Re: AW: Problems with hanging osiSockTest Michael Davidsaver via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: another git question Konrad, Martin via Core-talk

Next: AW: another git question Zimoch Dirk (PSI) via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024