# [TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes 2 messages from 2008-08-08 to 2008-08-09. Participants: Bert Wesarg, Petr Baudis. Thread: https://gitlist.dev/t/14884 ## Bert Wesarg, 2008-08-08 06:43 Subject: [TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes Message-ID: <1218177797-21589-1-git-send-email-bert.wesarg@googlemail.com> URL: https://gitlist.dev/e/1218177797-21589-1-git-send-email-bert.wesarg%40googlemail.com ``` The merge attribute hasn't any effect, because the wrong attribute file was used. Signed-off-by: Bert Wesarg --- tg.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tg.sh b/tg.sh index 03a392b..209b69e 100644 --- a/tg.sh +++ b/tg.sh @@ -45,11 +45,11 @@ setup_hook() # setup_ours (no arguments) setup_ours() { - if [ ! -s "$git_dir/info/gitattributes" ] || ! grep -q topmsg "$git_dir/info/gitattributes"; 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" - } >>"$git_dir/info/gitattributes" + } >>"$git_dir/info/attributes" fi if ! git config merge.ours.driver >/dev/null; then git config merge.ours.name '"always keep ours" merge driver' -- tg: (e311d15..) t/its-info-attributes (depends on: master) ``` ## Petr Baudis, 2008-08-09 00:28 Subject: Re: [PATCH] [TopGit] Pretty print the help creation commands in Makefile. Message-ID: <20080809002855.GP10151@machine.or.cz> URL: https://gitlist.dev/e/20080809002855.GP10151%40machine.or.cz In-Reply-To: <1218177797-21589-1-git-send-email-bert.wesarg@googlemail.com> ``` Hi, thanks, patches applied (after heavy dose of swearing in the general direction of git-am and git-apply at #git - now I'm really ashamed I've ever put "git is well-suited for patch-oriented workflows" on any of my slides). -- Petr "Pasky" Baudis The next generation of interesting software will be done on the Macintosh, not the IBM PC. -- Bill Gates ```