Commits
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
- Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
e1d27370ef5a6da06bbda0fc78bf629f1cb3ccd3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Fix ksh completion example to complete the first arg only; from Clint Pachl
- Commit:
43e4eb1bf2ab96fb4ea1fb53f993913df354db94
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Add got(1) command tab-completion for ksh(1) to EXAMPLES section.
Suggested by Clint Pachl, thanks!
- Commit:
2f1457c6ccfe722888511926c09af843da3bee0d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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@
- Commit:
a099809f2873564368fcd20d3d7be32ce4a5bc12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
more manual page updates following the introduction of 'got send'
- Commit:
93a300b296848449897d95643acc8a689b0480b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
small man page spelling fixes
- Commit:
fd44090b628aa7213949d0e8bcc696bf651aaa91
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak the man page section about 'got send'
In particular, attempt to describe the -f option better.
- Commit:
f8a36e221091eb68b439ebe4eb07a5d03b335c28
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
161728eb26bf63ad53f11367358ea6190bad8968
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got fetch -X' option for deleting references created by 'got fetch'
- Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -X option for removing backups created by got rebase and got histedit
ok semarie
- Commit:
ff56836b1637f806bb308057ef9bd6d90b725568
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Make 'got add' always require the -I option in order to add ignored files.
- Commit:
e67867107a97eae4801a85636493efb4239a61cd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mention 'gotadmin cleanup' wherever Git's garbage collector is mentioned
- Commit:
7e36bc2b1f67a25dc320b059eca47d1449d8881d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move todo items from got.1 caveats to gotadmin.1 as appropriate
- Commit:
edeec58d23dd51142c38473bb24acc0605159771
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove a todo item from got.1 caveats; 'gotadmin pack' can pack repositories
- Commit:
3217be6de1cc0e1f8b9e6f4928e99714958818a6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1, add -I to the synopsis line of the status command
- Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -I option for 'got status' to show files which match an ignore pattern
- Commit:
91c822287f301e456932520144ecfeccc5603383
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: make double-quotes appear in the rendered man page as intended
Patch by Nam Nguyen
- Commit:
0a79feb19b449594a4dbf7aad0a5a5e0c4cd6c9c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Xr gotadmin(1)
- Commit:
1795b260b54186116911b1d32d6767ea9b221b04
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word
- 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
- Commit:
601aba22ab7ec8a86055e5fca4fcef11882c3ba4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve got ref -d documentation: mention that objects won't be deleted
ok jrick
- Commit:
4e20a6488836bfbb096ecad1bad212e094cc8624
- From:
- Josh Rickmar <jrick@companyzero.com>
- Date:
Clarify log -x is inclusive
ok stsp
- 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!
- 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@