Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

3-way git merge driver for PO files and development bootstrapping script (the start of it anyways)

Browse source
This commit is contained in:
Albert Santoni 2014-08-27 16:43:54 -04:00
parent d1971b6d2b
commit 2ac3633f69
2 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev_tools/bootstrap_development_environment.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/bash
# Set up 3 way PO file merging, which we need for non-mainline branches
cp scripts/git-merge-po /usr/local/bin
chmod +x /usr/local/bin/git-merge-po
cat git-config-git-merge-po >> ../.git/config
cat git-attributes-git-merge-po >> ../.gitattributes