phorge-phorge/scripts/celerity/install_merge.sh at 6f3d15bb82775a964fab027042f93476fc60c025 - revi-archive/phorge-phorge - SiliconForest Atelier

revi-archive/phorge-phorge

mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 22:40:55 +01:00

vrana 80d9a276f3 Automatically resolve merge conflicts in Celerity map

Summary:
We can use `.gitattributes` instead but there's no way how to set repository config for all users in Git, right?
So provide a script writting to `.git/info/attributes` instead so that we don't have to .gitignore `.gitattributes`.

Test Plan:
  $ scripts/celerity/install_merge.sh
  $ git pull # with merge conflict in Celerity map

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3228

2012-08-09 15:59:18 -07:00

9 lines

266 B

Bash

Executable file

Raw Blame History

 #!/bin/sh
 echo "src/__celerity_resource_map__.php merge=celerity" \
   >> `dirname "$0"`/../../.git/info/attributes
 git config merge.celerity.name "Celerity Mapper"
 git config merge.celerity.driver \
   '$GIT_DIR/../scripts/celerity_mapper.php $GIT_DIR/../webroot'