Commits

Commit:
5a950d099a15fa3dc29590f3a8e90de9d6e1972b
From:
Stefan Sperling <stsp@stsp.name>
Date:
using a local packfd variable in open_worktree() is sufficient
diff | patch | tree
Commit:
0ae84acc1f0a0584e4f26ccbe029c895043b3abe
From:
Tracey Emery <tracey@traceyemery.net>
Date:
move got_opentempfd out of got_repo_open. ok stsp@ thanks for all the help massaging this diff
diff | patch | tree
Commit:
f259c4c18277237ced1043033cb1af739f73db28
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey
diff | patch | tree
Commit:
437adc9d5be73b4b89441362ec89de754374a5a6
From:
Yang Zhong <yzhong@freebsdfoundation.org>
Date:
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
Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5
From:
Stefan Sperling <stsp@stsp.name>
Date:
add per-worktree got.conf(5) file in the .got directory; ok millert
diff | patch | tree
Commit:
f0b75401029052c2613a1e5dc3882976b2ab4da9
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix out-of-date check regression; only commit staged files after 'got stage'
diff | patch | tree
Commit:
c3022ba5fc09b6badac00b8c123aad9d45c2e039
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename "histedit list" to "histedit script" (on-disk filename changed)
diff | patch | tree
Commit:
0ebf8283cd162a594e725ca2a1fd9f16e6ece6e4
From:
Stefan Sperling <stsp@stsp.name>
Date:
initial 'got histedit' implementation
diff | patch | tree
Commit:
818c750100809b9b2d2c638d39f1427a66929fce
From:
Stefan Sperling <stsp@stsp.name>
Date:
initial 'got rebase' implementation
diff | patch | tree
Commit:
1ab61ced3b985960fcf0256e1720fb712311aeb7
From:
Stefan Sperling <stsp@stsp.name>
Date:
use absolute path for reference in got/worktree namespace
diff | patch | tree
Commit:
8656d6c4d5273b7a838b8d2b0b057891e50a2ece
From:
Stefan Sperling <stsp@stsp.name>
Date:
make struct got_commitable opaque to library users
diff | patch | tree
Commit:
36a387004fc6fb4f302443e39bdffc01d1c1ed47
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop caching head ref's value in struct got_worktree; may become stale
diff | patch | tree
Commit:
7bcb2ecfc09de529ad7b240ac847222205ea9a4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
move worktree base refs into a subdirectory
diff | patch | tree
Commit:
517bab732f80f5ecc6af2ffcfe6fe1e363303c01
From:
Stefan Sperling <stsp@stsp.name>
Date:
deduplicate code for constructing a worktree's base ref name
diff | patch | tree
Commit:
0cd1c46a9e4b3e3a7c7f2947c3eded6fb5439516
From:
Stefan Sperling <stsp@stsp.name>
Date:
create references to base commits of got worktrees
diff | patch | tree