Re: [PATCH 2/5] New version of pre-commit hook From: Jakub Narebski <hidden> Date: 2016-06-15 22:43:59 Wincent Colaiuta wrote: Now that "git diff --check" indicates problems with its exit code the pre-commit hook becomes a trivial one-liner.- if (/^(?:[<>=]){7}/) { - bad_line("unresolved merge conflict", $_); - } Aren't you losing this check with rewrite? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git
Keyboard shortcuts hback out one level jnext message in thread kprevious message in thread ldrill in Escclose help / fold thread tree ?toggle this help