add got branch -t option to sort listed branches by modification time

add got ref -t option to sort listed references by modification time

switch branches during noop rebases Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp

sort and de-duplicate work tree path command line arguments This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@

align 'diff -c' usage help with synopsis given in man page; suggested by naddy

implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@

remove code which was setting up repo_path redundantly from cmd_diff()

add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn

ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick

add histedit -e option which runs the 'edit' script command for every commit ok jrick

interrupt 'got histedit' upon missing/unversioned/not-deleted files

interrupt 'got rebase' upon missing/unversioned/not-deleted files

make 'got merge' interrupt the merge upon undeleted and unversioned files

print additional stats about things that went wrong during a merge

show commit progress output when 'got merge -c' is used Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@

implement 'got merge -n' which interrupts before creating a merge commit

make it possible to merge vendor branches with 'got merge'

for portability, handle errno variations upon open(2) failure with O_NOFOLLOW Problem pointed out by naddy for FreeBSD -portable. Discussed with millert, thomas adam, and naddy.

stop caring about obstructed versioned files in 'got merge' Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.

add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey

portable: initial Linux compilation This commit modifies the GoT main branch to be able to compile it under linux.

make 'got update' display the worktree's branch name upon success ok tracey

validate status codes given to 'got status -S'

make got status -s and -S options conflict

make 'got checkout' display the checked out reference and commit ID ok tracey