Commits

Commit:
1795b260b54186116911b1d32d6767ea9b221b04
From:
Klemens Nanni <kn@openbsd.org>
Date:
Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word
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:
601aba22ab7ec8a86055e5fca4fcef11882c3ba4
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve got ref -d documentation: mention that objects won't be deleted ok jrick
diff | patch | tree
Commit:
4e20a6488836bfbb096ecad1bad212e094cc8624
From:
Josh Rickmar <jrick@companyzero.com>
Date:
Clarify log -x is inclusive ok stsp
diff | patch | tree
Commit:
34d4e04c36ba27442a4c0c7187e648ce03e23275
From:
Stefan Sperling <stsp@stsp.name>
Date:
include remote branches in the output of 'got branch -l' This makes it easier to discover the existence of copies of remote branches in the local repository, and fixes a missing asterisk in 'got branch -l' while the work tree is switched to a remote branch. Prompted by feedback from helg, thanks!
diff | patch | tree
Commit:
28cf319f780087bba863715f31d4ec417eb87a6d
From:
Stefan Sperling <stsp@stsp.name>
Date:
add 'got commit -F' option to commit with a log message stored in a file To avoid accidents commit -F opens the prepared log message in an editor so it can be reviewed before the commit is created. For non-interactive use the -N option is required in addition to -F. ok millert@
diff | patch | tree
Commit:
a5a46be28fbbc316a4ce0adb5d92571a59a7e115
From:
Stefan Sperling <stsp@stsp.name>
Date:
in 'got clone', allow -l together with -q, for consistency with 'got fetch'
diff | patch | tree
Commit:
7b4f1fcb86e79aa7573d68553cd5324d4f2b148f
From:
Stefan Sperling <stsp@stsp.name>
Date:
in got.1 fix a 'got branch' example which used obsolete syntax
diff | patch | tree
Commit:
99495ddb79841fe89b0746d35a49bb81e9220096
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'reference' directive to remote repositories in got.conf(5) Make use of this in 'got clone' to persist -R option arguments given on the command line in the cloned repository's got.conf(5) file.
diff | patch | tree
Commit:
5aa20203afe33ce0cfd4dfc29e73626517246fab
From:
Stefan Sperling <stsp@stsp.name>
Date:
document that 'got clone -a' sets 'fetch-all-branches' in got.conf(5)
diff | patch | tree
Commit:
0c8b29c50669cb8958428fbf923f02a5b69184db
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'fetch-all-branches' configuration setting to got.conf(5) Set fetch-all-branches in the got.conf(5) file created by 'got clone -a' in order to make a future 'got fetch' act like 'got fetch -a' by default.
diff | patch | tree
Commit:
132af4a5fe242aab94fc8049abfb80888c26395f
From:
Stefan Sperling <stsp@stsp.name>
Date:
store all branches passed via 'got clone -b' in got.conf(5) and git-config(1)
diff | patch | tree
Commit:
612392ee9a232ecb6f4f9db91eafbe6693509bd9
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow the 'got fetch' -l option together with the -q option Make use of this in tests to hide useless output from ssh(1).
diff | patch | tree
Commit:
15d3c221e34cad474e87c43111417186822c887c
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got clone' pin the fetched branch in got.conf(5) Avoids relying on the server-side HEAD ref by default during future fetches.
diff | patch | tree
Commit:
cc63216e4c9ca57c8711120fc6028ed5d5e2dde9
From:
Stefan Sperling <stsp@stsp.name>
Date:
update got.1 CAVEATS section; prompted by feedback from otto@
diff | patch | tree
Commit:
9f6bb280654be7061fc00305743f6ace71f9a1cb
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove redundant explanation of histedit -f and -m options from got.1
diff | patch | tree
Commit:
b54435ba03758ce44a7b635de5b0eb44a9aa994f
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix typo in got.1: "only if" -> "if only"; pointed out by tracey
diff | patch | tree
Commit:
2a78779e85e34d352d7735c35ba7043a935a59e1
From:
Stefan Sperling <stsp@stsp.name>
Date:
document that histedit -f can only be used if starting a histedit operation
diff | patch | tree
Commit:
466785b9264da1a24c92aed9d706e76cc826601d
From:
Josh Rickmar <jrick@companyzero.com>
Date:
add histedit -f flag for folding shortcut "please push it" stsp
diff | patch | tree
Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle binary files in got/tog diff commands; add -a options to force text
diff | patch | tree
Commit:
5b73592571daf964152e05335bb0f465a1cd9654
From:
Stefan Sperling <stsp@stsp.name>
Date:
document our default choice of text editor; suggested by Ricky Cintron
diff | patch | tree
Commit:
46215d2a90d69074a235db573e8d851eff0aa424
From:
Stefan Sperling <stsp@stsp.name>
Date:
add 'got histedit' to got.1's list of commands which use EDITOR/VISUAL
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:
257add310e4b16ae43b467b91f66b773da39f470
From:
Stefan Sperling <stsp@stsp.name>
Date:
add got.conf(5) configuration file ok tracey
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