summaryrefslogtreecommitdiff
path: root/Documentation/hooks.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-04 08:34:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-04 08:34:39 (GMT)
commit27b4070e40a771c41ed581ef1ac98dd43e58ab87 (patch)
tree084c3b9f77e5d9e8253a16e6f9baea5d25f77e46 /Documentation/hooks.txt
parent4947cf9cc377b15006f3e649c59edf9bc813af6f (diff)
parent52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff)
downloadgit-27b4070e40a771c41ed581ef1ac98dd43e58ab87.zip
git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.gz
git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.bz2
Merge branch 'maint'
* maint: Fix 'git remote show' regression on empty repository in 1.5.4 Fix incorrect wording in git-merge.txt. git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options Fix random crashes in http_cleanup()
Diffstat (limited to 'Documentation/hooks.txt')
0 files changed, 0 insertions, 0 deletions