Commit Briefs

Thomas Adam

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey

diff | patch | tree

Yang Zhong

add fd field to got_worktree, modify got_fileindex_entry_update to use fds

These changes are intended to make got more compatible with FreeBSD's Capsicum. ok stsp

diff | patch | tree

Stefan Sperling

add per-worktree got.conf(5) file in the .got directory; ok millert

diff | patch | tree

Stefan Sperling

fix out-of-date check regression; only commit staged files after 'got stage'

diff | patch | tree

Stefan Sperling

rename "histedit list" to "histedit script" (on-disk filename changed)

diff | patch | tree

Stefan Sperling

initial 'got histedit' implementation

diff | patch | tree

Stefan Sperling

initial 'got rebase' implementation

diff | patch | tree

Stefan Sperling

use absolute path for reference in got/worktree namespace

diff | patch | tree

Stefan Sperling

make struct got_commitable opaque to library users

diff | patch | tree

Stefan Sperling

stop caching head ref's value in struct got_worktree; may become stale

diff | patch | tree

Stefan Sperling

move worktree base refs into a subdirectory

diff | patch | tree

Stefan Sperling

deduplicate code for constructing a worktree's base ref name

diff | patch | tree

Stefan Sperling

create references to base commits of got worktrees

diff | patch | tree

Stefan Sperling

read UUID back from work tree meta data

diff | patch | tree

Stefan Sperling

add a UUID to work tree meta data

diff | patch | tree

Stefan Sperling

store parsed head reference in struct got_worktree

diff | patch | tree

Stefan Sperling

store a parsed base commit ID in struct got_worktree

diff | patch | tree

Stefan Sperling

fix naming of some work tree meta data files and macros

diff | patch | tree

Stefan Sperling

make got_worktree_checkout_files() infer base commit from meta data

diff | patch | tree

Stefan Sperling

store base commit in a dedicated meta file

diff | patch | tree

Stefan Sperling

rename the library-internal headers again to a common prefix

diff | patch | tree