chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tg.sh: it's info/attributes not info/gitattributes
[topgit.git]
/
tg.sh
diff --git
a/tg.sh
b/tg.sh
index ead236154cc023c554638abe7503e0b8b3704148..c5c71a22fa25064b72746111b3e9633244956286 100644
(file)
--- a/
tg.sh
+++ b/
tg.sh
@@
-45,11
+45,11
@@
setup_hook()
# setup_ours (no arguments)
setup_ours()
{
# setup_ours (no arguments)
setup_ours()
{
- if [ ! -s "$git_dir/info/
gitattributes" ] || ! grep -q topmsg "$git_dir/info/git
attributes"; then
+ if [ ! -s "$git_dir/info/
attributes" ] || ! grep -q topmsg "$git_dir/info/
attributes"; then
{
echo -e ".topmsg\tmerge=ours"
echo -e ".topdeps\tmerge=ours"
{
echo -e ".topmsg\tmerge=ours"
echo -e ".topdeps\tmerge=ours"
- } >>"$git_dir/info/
git
attributes"
+ } >>"$git_dir/info/attributes"
fi
if ! git config merge.ours.driver >/dev/null; then
git config merge.ours.name '"always keep ours" merge driver'
fi
if ! git config merge.ours.driver >/dev/null; then
git config merge.ours.name '"always keep ours" merge driver'