summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Philip Oakley <philipoakley@iee.org>2015-01-05 22:22:53 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-12 15:12:05 -0800
commit92be938e96508a87fa2b0b78bd335fc6273f5763 (patch)
treeb7c46fc25884a1a6a6a45702eddaa44e24add259 /t/t3507-cherry-pick-conflict.sh
parentdoc: core.ignoreStat clarify the --assume-unchanged effect (diff)
downloadtgif-92be938e96508a87fa2b0b78bd335fc6273f5763.tar.xz
doc: core.ignoreStat update, and clarify the --assume-unchanged effect
The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Overhaul the general wording thus: 1. direct description of what is ignored given first. 2. example instruction of the user manual action required. 3. use sideways indirection for assume-unchanged and update-index references. 4. add a 'normally' to give leeway for the change detection. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions