Commit Briefs

Stefan Sperling

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Stefan Sperling

treat 'add vs add' on update as a text conflict for now

diff | patch | tree

Stefan Sperling

fix behaviour when 'got rm' is used twice

diff | patch | tree

Stefan Sperling

fix behaviour when 'got add' is used twice

diff | patch | tree

Stefan Sperling

make got_worktree_schedule_add() report 'added' via status_cb

diff | patch | tree

Stefan Sperling

add a basic implementation of 'got rm'

diff | patch | tree

Stefan Sperling

implement a basic 'got add' command

diff | patch | tree

Stefan Sperling

introduce got_worktree_resolve_path()

diff | patch | tree

Stefan Sperling

move worktree-specific error handling out of got_path_mkdir()

diff | patch | tree

Stefan Sperling

remove path portion from worktree base commit ref name

diff | patch | tree

Stefan Sperling

deduplicate code for constructing a worktree's base ref name

diff | patch | tree

Stefan Sperling

refuse to create got worktree at a git repo path

diff | patch | tree

Stefan Sperling

create references to base commits of got worktrees

diff | patch | tree

Stefan Sperling

better error if .got directory is missing files

diff | patch | tree

Stefan Sperling

plug memleak in got_open_worktree()

diff | patch | tree