git/Documentation, branch v2.4.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.22015-05-26T20:49:59ZGit 2.4.22015-05-26T20:49:59ZJunio C Hamanogitster@pobox.com2015-05-26T20:49:59Zurn:sha1:9eabf5b536662000f79978c4d1b6e4eff5c8d785
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/hash-object' into maint2015-05-26T20:49:25ZJunio C Hamanogitster@pobox.com2015-05-26T20:49:24Zurn:sha1:1e6c8babf86d8564104e159ce46df069c882a5af
"hash-object --literally" introduced in v2.2 was not prepared to
take a really long object type name.
* jc/hash-object:
write_sha1_file(): do not use a separate sha1[] array
t1007: add hash-object --literally tests
hash-object --literally: fix buffer overrun with extra-long object type
git-hash-object.txt: document --literally option
Git 2.4.12015-05-13T21:11:43ZJunio C Hamanogitster@pobox.com2015-05-13T21:11:43Zurn:sha1:aaa7e0d7f8f003c0c8ab34f959083f6d191d44ca
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 2.3.82015-05-11T21:39:28ZJunio C Hamanogitster@pobox.com2015-05-11T21:39:28Zurn:sha1:c99fec6e35437f9db228c5a37c676faf844b3fa3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.3.82015-05-11T21:36:31ZJunio C Hamanogitster@pobox.com2015-05-11T21:36:31Zurn:sha1:9a3d637541a5b6fcd84b6f5fa057e597d1696460
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.32015-05-11T21:34:01ZJunio C Hamanogitster@pobox.com2015-05-11T21:34:01Zurn:sha1:811ce1b47c5486fa3348617d062e2eb4593962a1
Documentation fix.
* mm/usage-log-l-can-take-regex:
log -L: improve error message on malformed argument
Documentation: change -L:<regex> to -L:<funcname>
git-hash-object.txt: document --literally option2015-05-04T21:19:23ZEric Sunshinesunshine@sunshineco.com2015-05-04T07:25:13Zurn:sha1:83115ac4a811ef37318bc0e68a5e8b229751a88f
Document the git-hash-object --literally option added by 5ba9a93
(hash-object: add --literally option, 2014-09-11).
While here, also correct a minor typesetting oversight.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.42015-04-30T18:25:06ZJunio C Hamanogitster@pobox.com2015-04-30T18:25:06Zurn:sha1:3d4a3ffe64162b45ae7c991fc60623ecb4678cfd
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mg/show-notes-doc'2015-04-28T20:00:20ZJunio C Hamanogitster@pobox.com2015-04-28T20:00:20Zurn:sha1:3f5872603d00d4a0e5d2ca4c5e8772fa4667dda8
Documentation fix.
* mg/show-notes-doc:
rev-list-options.txt: complete sentence about notes matching
Merge branch 'nd/versioncmp-prereleases'2015-04-28T20:00:19ZJunio C Hamanogitster@pobox.com2015-04-28T20:00:19Zurn:sha1:b7990520bcac8ca1ade41ac61db80c5dcd0d821a
* nd/versioncmp-prereleases:
git tag: mention versionsort.prereleaseSuffix in manpage