diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:48 -0700 |
| commit | b59c06092f2ed8f434ffe298bf55578dffb18cca (patch) | |
| tree | f7e2ea033a93908e729d2a353a1a1992bef2d97b /Documentation/git-merge.txt | |
| parent | Merge branch 'jk/clone-unborn-head-in-bare' into maint (diff) | |
| parent | Documentation: cleanup git-cvsserver (diff) | |
| download | tgif-b59c06092f2ed8f434ffe298bf55578dffb18cca.tar.xz | |
Merge branch 'cb/cvsserver' into maint
"git cvsserver" had a long-standing bug in its authentication code,
which has finally been corrected (it is unclear and is a separate
question if anybody is seriously using it, though).
* cb/cvsserver:
Documentation: cleanup git-cvsserver
git-cvsserver: protect against NULL in crypt(3)
git-cvsserver: use crypt correctly to compare password hashes
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions