Commit Briefs

f259c4c182 Stefan Sperling

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey

diff | patch | tree

437adc9d5b 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

50b0790ed9 Stefan Sperling

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

diff | patch | tree

f0b7540102 Stefan Sperling

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

diff | patch | tree

c3022ba5fc Stefan Sperling

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

diff | patch | tree

0ebf8283cd Stefan Sperling

initial 'got histedit' implementation

diff | patch | tree

818c750100 Stefan Sperling

initial 'got rebase' implementation

diff | patch | tree

1ab61ced3b Stefan Sperling

use absolute path for reference in got/worktree namespace

diff | patch | tree

8656d6c4d5 Stefan Sperling

make struct got_commitable opaque to library users

diff | patch | tree

36a387004f Stefan Sperling

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

diff | patch | tree

7bcb2ecfc0 Stefan Sperling

move worktree base refs into a subdirectory

diff | patch | tree

517bab732f Stefan Sperling

deduplicate code for constructing a worktree's base ref name

diff | patch | tree

0cd1c46a9e Stefan Sperling

create references to base commits of got worktrees

diff | patch | tree

c442a90d57 Stefan Sperling

read UUID back from work tree meta data

diff | patch | tree

ec22038e8d Stefan Sperling

add a UUID to work tree meta data

diff | patch | tree

271d2a38b1 Stefan Sperling

store parsed head reference in struct got_worktree

diff | patch | tree

eaccb85f72 Stefan Sperling

store a parsed base commit ID in struct got_worktree

diff | patch | tree

0f92850ea2 Stefan Sperling

fix naming of some work tree meta data files and macros

diff | patch | tree

93a3027739 Stefan Sperling

make got_worktree_checkout_files() infer base commit from meta data

diff | patch | tree

65596e1591 Stefan Sperling

store base commit in a dedicated meta file

diff | patch | tree

718b3ab0e3 Stefan Sperling

rename the library-internal headers again to a common prefix

diff | patch | tree