Commits

Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6
From:
Stefan Sperling <stsp@stsp.name>
Date:
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@
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:
abc59930d57a2d46c310e1b0c758c948554bc1af
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -I option for 'got status' to show files which match an ignore pattern
diff | patch | tree
Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
ensure that old commits remain referenced after rebase and histedit Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick
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:
766841c2970cb5bef66c9c69201b231d0eefb120
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -s option to 'got remove' which deletes files in a particular status This makes it easy to deal with files that were deleted from disk by external tooling which modified the work tree. Such files are left in missing (!) status and can now be marked for deletion in bulk via 'got rm -s\! -R .' For consistency, modified (M) files can now be removed with 'got rm -s M' which implies 'got rm -f'. Prompted by feedback from krw@
diff | patch | tree
Commit:
b2118c49a14c29447e228bf9a2b2a38f2da4f10b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Add a 'got info' command which displays work tree meta-data. Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert
diff | patch | tree
Commit:
35213c7c838a48142d398147b54bb9938af8cab0
From:
Stefan Sperling <stsp@stsp.name>
Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
diff | patch | tree
Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' skip conflicted files ok millert@
diff | patch | tree
Commit:
7f47418fd49bc98fe4570c139767c057cd066409
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got checkout' and 'got update' work with read-only repositories but warn users about the garbage collection problem
diff | patch | tree
Commit:
70e3e7f5a129106c0c31204233b35dfdf0d6a990
From:
Tracey Emery <tracey@traceyemery.net>
Date:
add -k option to 'got remove' to keep files on disk ok stsp
diff | patch | tree
Commit:
12463d8bf337d3eb12e6cd73d5bd1f25c278e571
From:
Stefan Sperling <stsp@stsp.name>
Date:
address some of the file descriptor vs. path races in status callbacks
diff | patch | tree
Commit:
f2a9dc41d851ff2d575b08c2766583ff11cdd7af
From:
Tracey Emery <tracey@traceyemery.net>
Date:
add -R option to 'got remove' for recursive deletion ok stsp
diff | patch | tree
Commit:
022fae89eee20051d352d3dc2b8c64486bdafe93
From:
Tracey Emery <tracey@traceyemery.net>
Date:
Introduce -I to cmd_add to disregard ignores when adding recursively. Expand add.sh tests. Update TODO.
diff | patch | tree