Commits


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


update 'got merge' TODO item


bump version number


CHANGES for 0.61


sync dist file list


skip ignored directories during 'got status' disk crawl


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


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


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.


fix unsigned/signed char mismatch in parse.y


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


interrupt 'got histedit' upon missing/unversioned/not-deleted files


interrupt 'got rebase' upon missing/unversioned/not-deleted files


document all reasons why 'got merge' might be interrupted


make 'got merge' interrupt the merge upon undeleted and unversioned files