development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues 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
parent ba580aeafb 61c2bcbd11
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
git-rerere
fi
die "Automatic merge failed; fix up by hand"
die "Automatic merge failed; fix conflicts and then commit the result."
fi

3
templates/hooks--pre-commit
View file

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