summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-04 14:49:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-04 15:55:29 -0700
commitcf87463e79a3018f666bfc9af113d3eea58a3d82 (patch)
tree9ef6d870995ed8c15d9a1c3b4223c89e6ac05ee3 /Documentation/merge-options.txt
parentGIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries (diff)
downloadtgif-cf87463e79a3018f666bfc9af113d3eea58a3d82.tar.xz
Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
If a missing ONE_FILESYSTEM defaults to true, the only users who set this variable set it to false to tell git not to limit the discovery to one filesystem; there are too many negations in one sentence to make a simple panda brain dizzy. Use the variable GIT_DISCOVERY_ACROSS_FILESYSTEM that changes the behaviour from the default "limit to one filesystem" to "cross the boundary as I ask you to"; makes the semantics much more straight forward. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions