Commit Briefs

90e6e62040 Klemens Nanni

Fix "mandoc -T lint -W style got/got.1" nits


95f394e891 Klemens Nanni

Document command aliases in tmux(1) style, add tags for navigation

This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp


136be4cc66 Stefan Sperling

update 'got merge' TODO item


2b8ed9ecaa Stefan Sperling

bump version number


9d9e459fa6 Stefan Sperling

CHANGES for 0.61 (tags/0.61)


c52bf7fe57 Stefan Sperling

sync dist file list


62da319662 Stefan Sperling

skip ignored directories during 'got status' disk crawl


b93c7142c1 Stefan Sperling

add histedit -e option which runs the 'edit' script command for every commit

ok jrick


78caff98cb Stefan Sperling

explicitly set the default branch name after 'git init' in regress tests

We need to do this because newer versions of Git support an arbitrary default branch name which can be set by users. We don't want tests to fail when this option is used. pointed out by Thomas Adam


5d8cbca3b3 Christian Weisgerber

pull in a type fix from the OpenBSD parse.y template

Original commit message by deraadt: (unsigned) means (unsigned int) which on ptrdiff_t or size_t or other larger types really is a range reduction... Almost any cast to (unsigned) is a bug.


d683c314c5 Christian Weisgerber

fix unsigned/signed char mismatch in parse.y


fa161f0bf4 Stefan Sperling

update a CAVEAT in got.1 now that 'got merge' exists




606719cd7b Stefan Sperling

document all reasons why 'got merge' might be interrupted




965803d33f Stefan Sperling

fix 'got fetch' downloading too many objects in some cases

Always announce all local references to the server when fetching changes. We used to do this only in mirror mode. In regular mode only refs/tags and refs/remotes/origin were announced, which could result in unnecessary downloads if relevant objects exist in refs/heads or elsewhere.


9dd14b990b Christian Weisgerber

got_sha1_digest_to_str() writes to char *

ok stsp


14af92996a Christian Weisgerber

fix unsigned/signed char mismatch in parse.y

ok stsp


31e61ec13d Christian Weisgerber

match the unsigned char type used by the zlib interface

ok stsp


0ff8d23662 Stefan Sperling

show commit progress output when 'got merge -c' is used

Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@


321a74a5ca Christian Weisgerber

garbage-collect unused "dist" target from subdirectory Makefiles

ok stsp



4e91ef1519 Stefan Sperling

make it possible to merge vendor branches with 'got merge'