Commits


remove 'got merge -M' todo item


fix broken sentence in got.1 (was missing a word)


Make got_worktree_get_base_ref_name static Nothing appears to benefit from this being non-static, and it was missing from the public API headers as well. ok stsp@


Define apply_umask earlier, without predeclaration ok op@


consistently mention 'got merge' as an alternative to 'got rebase' in got.1


histedit, rebase: document -c, -C are compatible


fix option processing for 'got merge' Don't make -C imply -c (a break statement was missing). Detect -an and -cn conflicts. Simplify by removing unneeded check for conflicting -aC (since -C requires -c, we can rely on the -ac conflict being detected). Update the man page to say -cC is allowed.


add -M option: tell got merge not to fast-forward ok stsp@


bubble up got_repo_commits() now that got_get_repo_commits() doesn't look at `action' we can stop fetching the commits during the rendering and bubble up the call. This yields better error messages and better replies codes on failure.


drop hack; got_get_repo_commits() doesn't look at action anymore


use _POSIX_HOST_NAME_MAX from <limits.h> for portability ok stsp


bump version number


CHANGES for 0.90


rate-limit redundant pack cleanup progress output


fix cleanup progress reporting output