|
69de9dd4
|
2021-09-03T09:02:06
|
|
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
|
|
|
a16d97bd
|
2021-09-02T19:19:49
|
|
remove ancestry sanity checks from 'got cherrypick' and 'got backout'
While these checks might catch usage mistakes the performance overhead
of scanning the entire history of the current branch is not worth it.
Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's
src repository in usr.bin/rsync:
Before: 5m50.33s real 4m02.36s user 2m04.41s system
After: 1m04.92s real 0m28.24s user 0m36.54s system
Further performance improvements could be needed but this is a first step.
|
|
|
e1d27370
|
2021-09-01T11:58:40
|
|
Fix ksh completion example to complete the first arg only; from Clint Pachl
|
|
|
43e4eb1b
|
2021-08-29T07:28:01
|
|
Add got(1) command tab-completion for ksh(1) to EXAMPLES section.
Suggested by Clint Pachl, thanks!
|
|
|
2f1457c6
|
2021-08-27T16:48:53
|
|
allow deletion of refs/remotes/ branches with got branch -d
Also, make requirements for branch name arguments more flexible.
Absolute reference names are now accepted.
ok naddy@
|
|
|
a099809f
|
2021-08-27T07:44:17
|
|
more manual page updates following the introduction of 'got send'
|
|
|
93a300b2
|
2021-08-26T21:50:10
|
|
small man page spelling fixes
|
|
|
fd44090b
|
2021-08-26T19:53:20
|
|
tweak the man page section about 'got send'
In particular, attempt to describe the -f option better.
|
|
|
f8a36e22
|
2021-08-26T12:30:42
|
|
add 'got send' command for sending changes to remote repositories
Known to work against git-daemon and github Git server implementations.
Tests by abieber, naddy, jrick, and myself.
Man page additions reviewed by Lucas.
|
|
|
161728eb
|
2021-07-24T09:08:52
|
|
add 'got fetch -X' option for deleting references created by 'got fetch'
|
|
|
643b85bc
|
2021-07-16T10:47:10
|
|
new -X option for removing backups created by got rebase and got histedit
ok semarie
|
|
|
ff56836b
|
2021-07-08T10:30:10
|
|
Make 'got add' always require the -I option in order to add ignored files.
|
|
|
e6786710
|
2021-07-03T22:08:15
|
|
mention 'gotadmin cleanup' wherever Git's garbage collector is mentioned
|
|
|
7e36bc2b
|
2021-06-25T09:23:51
|
|
move todo items from got.1 caveats to gotadmin.1 as appropriate
|
|
|
edeec58d
|
2021-06-25T09:22:59
|
|
remove a todo item from got.1 caveats; 'gotadmin pack' can pack repositories
|
|
|
3217be6d
|
2021-06-22T20:03:59
|
|
in got.1, add -I to the synopsis line of the status command
|
|
|
f6343036
|
2021-06-22T20:00:44
|
|
new -I option for 'got status' to show files which match an ignore pattern
|
|
|
91c82228
|
2021-04-18T11:50:01
|
|
got.1: make double-quotes appear in the rendered man page as intended
Patch by Nam Nguyen
|
|
|
0a79feb1
|
2021-04-10T13:35:23
|
|
Xr gotadmin(1)
|
|
1795b260
|
2021-04-02T23:31:08
|
|
Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word
|
|
|
e600f124
|
2021-03-21T19:09:35
|
|
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
|
|
|
601aba22
|
2021-03-21T19:08:46
|
|
improve got ref -d documentation: mention that objects won't be deleted
ok jrick
|
|
4e20a648
|
2021-03-21T16:39:29
|
|
Clarify log -x is inclusive
ok stsp
|
|
|
34d4e04c
|
2021-02-08T13:52:37
|
|
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!
|
|
|
28cf319f
|
2021-01-28T17:06:22
|
|
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@
|
|
|
a5a46be2
|
2021-01-27T22:20:52
|
|
in 'got clone', allow -l together with -q, for consistency with 'got fetch'
|
|
|
7b4f1fcb
|
2021-01-27T22:12:42
|
|
in got.1 fix a 'got branch' example which used obsolete syntax
|
|
|
99495ddb
|
2021-01-10T23:48:51
|
|
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.
|
|
|
5aa20203
|
2021-01-05T17:51:49
|
|
document that 'got clone -a' sets 'fetch-all-branches' in got.conf(5)
|
|
|
0c8b29c5
|
2021-01-05T17:22:14
|
|
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.
|
|
|
132af4a5
|
2021-01-05T15:30:44
|
|
store all branches passed via 'got clone -b' in got.conf(5) and git-config(1)
|
|
|
612392ee
|
2021-01-05T14:01:16
|
|
allow the 'got fetch' -l option together with the -q option
Make use of this in tests to hide useless output from ssh(1).
|
|
|
15d3c221
|
2021-01-05T13:47:37
|
|
make 'got clone' pin the fetched branch in got.conf(5)
Avoids relying on the server-side HEAD ref by default during future fetches.
|
|
|
cc63216e
|
2020-12-26T12:23:23
|
|
update got.1 CAVEATS section; prompted by feedback from otto@
|
|
|
9f6bb280
|
2020-12-11T11:41:43
|
|
remove redundant explanation of histedit -f and -m options from got.1
|
|
|
b54435ba
|
2020-12-11T01:19:21
|
|
fix typo in got.1: "only if" -> "if only"; pointed out by tracey
|
|
|
2a78779e
|
2020-12-11T01:18:32
|
|
document that histedit -f can only be used if starting a histedit operation
|
|
|
466785b9
|
2020-12-10T23:24:31
|
|
add histedit -f flag for folding shortcut
"please push it" stsp
|
|
|
64453f7e
|
2020-11-21T13:35:00
|
|
handle binary files in got/tog diff commands; add -a options to force text
|
|
|
5b735925
|
2020-09-15T09:52:03
|
|
document our default choice of text editor; suggested by Ricky Cintron
|
|
|
46215d2a
|
2020-09-11T18:32:20
|
|
add 'got histedit' to got.1's list of commands which use EDITOR/VISUAL
|
|
|
50b0790e
|
2020-09-11T17:04:57
|
|
add per-worktree got.conf(5) file in the .got directory; ok millert
|
|
|
257add31
|
2020-09-09T23:57:40
|
|
add got.conf(5) configuration file
ok tracey
|
|
|
766841c2
|
2020-08-13T19:12:57
|
|
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@
|
|
|
081470ac
|
2020-08-13T19:12:57
|
|
add -s option to 'got status' which acts as a status code filter
Advantages over using grep are that the list of codes is validated against
a list of known status codes, and that it is easier to match staged files
which can display status codes in one or both of two columns.
Prompted by feedback from krw@
|
|
|
b2118c49
|
2020-07-28T20:17:19
|
|
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
|
|
|
cf07f22b
|
2020-07-25T16:28:50
|
|
improve "got log ." command mark-up in got.1 EXAMPLES
|
|
|
af358f55
|
2020-07-23T16:49:58
|
|
tweak description of new -S option for 'got commit' and 'got stage'
with input from + ok tracy and millert
|
|
|
35213c7c
|
2020-07-23T14:22:39
|
|
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
|
|
|
3b9f0f87
|
2020-07-23T14:22:35
|
|
handle additional symlink conflicts and report skipping of unversioned files
|
|
|
c90c8ce3
|
2020-07-23T14:22:35
|
|
preserve unversioned files when merging added symlinks
|
|
|
bcbc2272
|
2020-05-20T17:40:57
|
|
document how to use commit messages prepared in a file; patch by Scott Bennett
|
|
|
0d6c6ee3
|
2020-05-20T17:37:29
|
|
make 'got/tog tree' show symlink targets like 'ls -lF' does: link@ -> target
|
|
|
0208f208
|
2020-05-05T09:53:57
|
|
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
|
|
|
bd81cfb7
|
2020-04-19T08:57:07
|
|
clarify wording in got.1 related to local changes/commits/branches
|
|
|
3d0ac559
|
2020-04-18T22:22:29
|
|
wording tweak in got.1
|
|
|
04e9dcf3
|
2020-04-18T22:20:57
|
|
add an example for log -R to got.1
|
|
|
dbec59df
|
2020-04-18T21:24:54
|
|
add 'got log' -R option to reverse commit display order
|
|
|
52ab7958
|
2020-04-18T21:15:07
|
|
tweak documentation of 'got log -x' for accuracy
|
|
|
5036ab18
|
2020-04-18T18:40:00
|
|
make 'got update' skip conflicted files
ok millert@
|
|
|
d1fe46f9
|
2020-04-18T10:28:24
|
|
add 'got log' -x option to stop logging when a specific commit was traversed
|
|
|
b784a72b
|
2020-04-01T08:11:31
|
|
remove a redundant .Pp in got.1 (found by mandoc -T lint)
|
|
|
4f331d3a
|
2020-04-01T08:11:09
|
|
in got.1, clarify how 'got update' deals with local (aka uncommitted) changes
|
|
|
b2070a3f
|
2020-03-22T14:21:07
|
|
allow for limiting output of 'got ref -l' to a single ref or a namespace
|
|
|
e31abbf2
|
2020-03-22T14:21:06
|
|
add -c option to 'got ref' which now expects just one argument after options
|
|
|
eac81709
|
2020-03-21T23:50:41
|
|
add missing .Pp in got.1
|
|
|
fc24bb3a
|
2020-03-21T23:39:56
|
|
wording tweak in got.1
|
|
|
a18cccf9
|
2020-03-21T23:37:45
|
|
more small man page tweaks for clone and fetch
|
|
|
71f12362
|
2020-03-21T23:24:06
|
|
document that clone and fetch -R options accept reference namespaces
|
|
|
4d482d9d
|
2020-03-21T23:13:22
|
|
in got.1, add the -R option to synopsis of got fetch
|
|
|
0e4002ca
|
2020-03-21T21:49:13
|
|
add support for fetching arbitrary references to 'got clone' and 'got fetch'
|
|
|
239821eb
|
2020-03-21T20:03:12
|
|
correctness fix in got.1: tags usually point to tag objects
|
|
|
1d4b192f
|
2020-03-21T20:00:35
|
|
in got.1 be explicit about the fact that our branches live in "refs/heads/"
|
|
|
498ef124
|
2020-03-21T20:00:32
|
|
clarify the distinction between mirror and regular repositories
|
|
|
db6d8ad8
|
2020-03-21T19:40:36
|
|
prevent existing tags from being overwritten by 'got fetch' by default
|
|
|
2690194b
|
2020-03-21T18:17:12
|
|
remove GOT_FETCH_DEBUG and toggle fetch debug output with -v option instead
|
|
|
f21ec2f0
|
2020-03-21T11:20:33
|
|
add -d option to 'got fetch' for deleting old branches and tags
|
|
|
41b0de12
|
2020-03-21T10:18:15
|
|
add support for listing remote branches and tags to 'got clone' and 'got fetch'
|
|
|
4ba14133
|
2020-03-20T20:23:18
|
|
add support for fetching specific branches to 'got clone' and 'got fetch'
|
|
|
f8ab0c60
|
2020-03-20T20:23:18
|
|
got.1 wording tweak for clarity
|
|
|
10c073e7
|
2020-03-20T16:53:42
|
|
got.1 wording fix
|
|
|
3493b628
|
2020-03-20T16:53:05
|
|
man page wording simplification: target-direcory -> directory
|
|
|
175367bd
|
2020-03-20T16:48:26
|
|
got(1) man page wording tweak
|
|
|
010f7279
|
2020-03-20T16:43:21
|
|
line to git-repository(5) for details about pack files
|
|
|
89c3c67b
|
2020-03-20T16:40:24
|
|
document what got-index-pack does
|
|
|
659e7fbd
|
2020-03-20T15:55:08
|
|
fetch only HEAD branch and tags by default; add -a option to fetch everything
|
|
|
619eb6dd
|
2020-03-20T12:03:47
|
|
document use of port numbers in URLs
|
|
|
bf390dec
|
2020-03-20T11:46:18
|
|
in got.1 EXAMPLES, move the 'got integrate' example further up
|
|
|
469dd726
|
2020-03-20T11:44:14
|
|
add support for repository mirrors to 'got clone' and 'got fetch'
|
|
|
858b0dfb
|
2020-03-20T11:01:44
|
|
re-add chatty mode to got-fetch-pack; it will be useful to diagnose bugs
|
|
|
7848a0e1
|
2020-03-19T16:57:27
|
|
implement 'got fetch'
|
|
|
267fe567
|
2020-03-18T16:16:39
|
|
document 'got cl' alias for 'got clone'
|
|
|
2ab43947
|
2020-03-18T16:16:39
|
|
move clone code and documentation up so it appears before checkout
|
|
|
68999b92
|
2020-03-18T16:13:48
|
|
allow controlling verbosity of 'got clone' with -q and -v options
|
|
|
fd039d72
|
2020-03-18T16:13:47
|
|
man page updates for 'got clone'
|
|
|
83b416ed
|
2020-03-18T16:10:30
|
|
add ori as author
|
|
|
5b87815e
|
2020-03-05T11:20:24
|
|
prevent commits from being listed more than once in a histedit script
While merging a commit multiple times during a histedit operation could
potentially make sense in some corner case, a commit appearing more than
once in the script is more likely to happen accidentally.
If desired, the same effect can still be achieved by running multiple
histedit operations, or by using 'got cherrypick' while the histedit
operation is paused for arbitrary editing.
|
|
|
4b6c9460
|
2020-03-05T08:41:12
|
|
be helpful when users try to check out work trees without a known branch
Provide a useful error message in such cases and explicitly document
intentional restrictions in the got(1) man page.
Prompted by a question from Adam Steen via bsd.network
https://bsd.network/@adams/103768951483318235
|
|
|
c10890ce
|
2020-02-25T13:32:18
|
|
in got.1, clarify that rebasing of branches with zero local changes is normal
|
|
|
2b6826ba
|
2020-02-24T22:04:15
|
|
attempt to more clearly explain what 'got rebase' is used for
|