{"thread":{"id":"14884","subject":"[TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes","startedAt":"2008-08-08T06:43:17Z","lastAt":"2008-08-09T00:28:55Z","messageCount":2,"participants":["Bert Wesarg","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"86458","messageId":"1218177797-21589-1-git-send-email-bert.wesarg@googlemail.com","threadId":"14884","inReplyTo":null,"subject":"[TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2008-08-08T06:43:17Z","receivedAt":"2008-08-08T06:43:17Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"The merge attribute hasn't any effect, because the wrong attribute file was\nused.\n\nSigned-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n\n---\n tg.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/tg.sh b/tg.sh\nindex 03a392b..209b69e 100644\n--- a/tg.sh\n+++ b/tg.sh\n@@ -45,11 +45,11 @@ setup_hook()\n # setup_ours (no arguments)\n setup_ours()\n {\n-\tif [ ! -s \"$git_dir/info/gitattributes\" ] || ! grep -q topmsg \"$git_dir/info/gitattributes\"; then\n+\tif [ ! -s \"$git_dir/info/attributes\" ] || ! grep -q topmsg \"$git_dir/info/attributes\"; then\n \t\t{\n \t\t\techo -e \".topmsg\\tmerge=ours\"\n \t\t\techo -e \".topdeps\\tmerge=ours\"\n-\t\t} >>\"$git_dir/info/gitattributes\"\n+\t\t} >>\"$git_dir/info/attributes\"\n \tfi\n \tif ! git config merge.ours.driver >/dev/null; then\n \t\tgit config merge.ours.name '\"always keep ours\" merge driver'\n-- \ntg: (e311d15..) t/its-info-attributes (depends on: master)\n"},{"id":"86563","messageId":"20080809002855.GP10151@machine.or.cz","threadId":"14884","inReplyTo":"1218177797-21589-1-git-send-email-bert.wesarg@googlemail.com","subject":"Re: [PATCH] [TopGit] Pretty print the help creation commands in Makefile.","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-08-09T00:28:55Z","receivedAt":"2008-08-09T00:28:55Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hi,\n\n  thanks, patches applied (after heavy dose of swearing in the general\ndirection of git-am and git-apply at #git - now I'm really ashamed\nI've ever put \"git is well-suited for patch-oriented workflows\" on\nany of my slides).\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nThe next generation of interesting software will be done\non the Macintosh, not the IBM PC.  -- Bill Gates\n"}]}