diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-22 23:25:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 23:25:19 -0800 |
| commit | 7a3db75beee75c4e1b5fdae7504bc2ba05c58b14 (patch) | |
| tree | 774efa464bf2e1663af1512db633c7de756ca74e /git-merge-ours.sh | |
| parent | Make test scripts executable. (diff) | |
| download | tgif-7a3db75beee75c4e1b5fdae7504bc2ba05c58b14.tar.xz | |
Fix sample pre-commit hook
If the worktree happened to have a file called HEAD, "diff-index --cached HEAD"
would complain about the ambiguity between revision and path. Avoid it by
using an explicit "--" for disambiguation.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions