undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  pre-commit hook: complain about conflict markers.
  git-merge: a bit more readable user guidance.
This commit is contained in:
Junio C Hamano 2006-04-19 15:41:55 -07:00
commit b8950769b8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -335,5 +335,5 @@ Conflicts:
then then
git-rerere git-rerere
fi fi
die "Automatic merge failed; fix up by hand" die "Automatic merge failed; fix conflicts and then commit the result."
fi fi

3
templates/hooks--pre-commit
View File

@ -61,6 +61,9 @@ perl -e '
if (/^\s* /) { if (/^\s* /) {
bad_line("indent SP followed by a TAB", $_); bad_line("indent SP followed by a TAB", $_);
} }
if (/^(?:[<>=]){7}/) {
bad_line("unresolved merge conflict", $_);
}
} }
} }
exit($found_bad); exit($found_bad);