summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-01-16 16:01:30 -0800
committerBharat Mediratta <bharat@menalto.com>2011-01-16 17:01:03 -0800
commit684958144817a724b41db9637486b9ced853c020 (patch)
tree91e04d5af8422ddc923fb42d4db2a9f6eebb79aa /.gitattributes
parente22c2e64ba9ba18706083710de7b15401fc4c9da (diff)
Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..9122eeb1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+BUILD_NUMBER merge=merge-keep-ours
+