Commit Briefs

Thomas Adam

add test for merge result when lines are inserted at the top of a file

Based on a patch by Omar Polo



Thomas Adam

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn




Thomas Adam

Ignore tags files

OK stsp


Thomas Adam

Provide lib/Makefile to enable tags file generation

The root Makefile does not hook into lib/ via <bsd.subdir.mk> since it is not a program itself and thus gets included by all others. This means `make tags` skips lib/ and `make -C lib/ tags` does not know what to do; provide a minimal <bsd.lib.mk> stub and hook it up just for the "tags" such that *all* source is browsable via tags. See /usr/share/mk/bsd.README for details. Feedback stsp tb OK tb


Thomas Adam

plug memory leaks in got-fetch-pack and got-send-pack

ok naddy


Thomas Adam

let 'got fetch' send all references to the server to avoid redundant downloads

Problem reported by naddy. ok naddy


Thomas Adam

Fix "mandoc -T lint -W style" nits


Thomas Adam

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

Complete 95f394e8917def2c11ce292b3a8f804d261b1d12; reminder to look at gotadmin(1) from stsp, thanks.




Thomas Adam

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


Thomas Adam

update 'got merge' TODO item


Thomas Adam

bump version number


Thomas Adam

CHANGES for 0.61


Thomas Adam

sync dist file list





Stefan Sperling

make ignore patterns work with 'got status'

ok thomas.adam


Thomas Adam

portable: update .gitignore

Add .orig to gitgnore.


Thomas Adam

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


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.