-
Notifications
You must be signed in to change notification settings - Fork 0
/
git-3way-merge.cfg
52 lines (42 loc) · 1.56 KB
/
git-3way-merge.cfg
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
#!/bin/bash
if [[ -f "git-3way-merge.local.cfg" ]]; then
source git-3way-merge.local.cfg
else
declare -A mergeMappings
declare -A skippableMergeMappings
# Define mappings for directories always being merged ..
mergeMappings[bootstrap3_templates]="themes/bootstrap3/templates"
mergeMappings[bootstrap3_js]="themes/bootstrap3/js"
mergeMappings[config_vufind]="config/vufind"
bootstrap3_templates=( themes/cpk-devel/templates )
bootstrap3_js=( themes/cpk-devel/js )
config_vufind=( local/cpk-front.mzk.cz/config/vufind )
# Define mappings which are about to be merged once upon a time (if is -a option specified ..)
skippableMergeMappings[skippable_bootstrap3_templates]="themes/bootstrap3/templates"
skippableMergeMappings[skippable_bootstrap3_js]="themes/bootstrap3/js"
skippableMergeMappings[skippable_config_vufind]="config/vufind"
skippable_bootstrap3_templates=( \
themes/vnf3/templates \
themes/mzk3/templates \
themes/historickefondy3/templates \
themes/common-bootstrap3/templates \
themes/cistbrno3/templates \
themes/portals-common3/templates \
themes/obalkyknih-api-v3-bootstrap3/templates
)
skippable_bootstrap3_js=( \
themes/vnf3/js \
themes/mzk3/js \
themes/historickefondy3/js \
themes/common-bootstrap3/js \
themes/cistbrno3/js \
themes/portals-common3/js \
themes/obalkyknih-api-v3-bootstrap3/js
)
skippable_config_vufind=( \
local/narodnifonoteka.cz/config/vufind \
local/vufind2.mzk.cz/config/vufind \
local/historickefondy.mzk.cz/config/vufind \
local/www.cistbrno.cz/config/vufind
)
fi