Commits
- Commit:
0c079dbc7e6ed9857d4a13d908cc6858d57c81ec
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint -W style" nits
- Commit:
b13a4ebcea7c7ed18b52d65e78ea2b78cc8bcd40
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Document command aliases in tmux(1) style, add tags for navigation
Complete 95f394e8917def2c11ce292b3a8f804d261b1d12;
reminder to look at gotadmin(1) from stsp, thanks.
- Commit:
41f061b2f459318f3738f59d7676efccc4beb344
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
90e6e6204014e47bc38fb5bcaf041cfdad190718
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint -W style got/got.1" nits
- Commit:
95f394e8917def2c11ce292b3a8f804d261b1d12
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Document command aliases in tmux(1) style, add tags for navigation
This has the advantage of tags being located right by the full command;
combined with tags ":tco" to search for the `co` alias will jump right
to the `checkout` line, neatly showing everything without needing
further navigation.
tmux hint from Thomas Adam, thanks.
OK stsp
- Commit:
136be4cc66ac0ccf41b481e5a22587681c050365
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update 'got merge' TODO item
- Commit:
2b8ed9ecaabe37e1f017b20d8b977e9bb1745712
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
9d9e459fa66f53a5ef36bacae7f394daacf2c6c8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.61
- Commit:
c52bf7fe573b3f64277c940f6cb99a39a07e8683
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sync dist file list
- Commit:
62da3196627c41ea9acc5f53e0da9887dca2b82d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
skip ignored directories during 'got status' disk crawl
- Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
78caff98cb8783be4d83da7279e407d4ccd1f187
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
explicitly set the default branch name after 'git init' in regress tests
We need to do this because newer versions of Git support an arbitrary default
branch name which can be set by users. We don't want tests to fail when this
option is used.
pointed out by Thomas Adam
- Commit:
5d8cbca3b331d9f20dc4ee509342988c82e11656
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
pull in a type fix from the OpenBSD parse.y template
Original commit message by deraadt:
(unsigned) means (unsigned int) which on ptrdiff_t or size_t or other
larger types really is a range reduction...
Almost any cast to (unsigned) is a bug.
- Commit:
d683c314c5dae715e5918b3952e8c5870db83648
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix unsigned/signed char mismatch in parse.y
- Commit:
fa161f0bf4d34a678ba30bf62f5e8eec44ceb931
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists
- Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
1fa4907213af37d50029ee33b989867f41f0f124
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
606719cd7bdc625a582f93ddbc966675568f0026
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document all reasons why 'got merge' might be interrupted
- Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
965803d33ff4b7472b22868076e8cbc13b069218
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got fetch' downloading too many objects in some cases
Always announce all local references to the server when fetching changes.
We used to do this only in mirror mode. In regular mode only refs/tags
and refs/remotes/origin were announced, which could result in unnecessary
downloads if relevant objects exist in refs/heads or elsewhere.
- Commit:
9dd14b990bedd4bcdfc1b21cdb8034be103f574b
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
got_sha1_digest_to_str() writes to char *
ok stsp
- Commit:
14af92996aee5b567441c4d2d56d236d8c979bed
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix unsigned/signed char mismatch in parse.y
ok stsp
- Commit:
31e61ec13d43c2edd56e80f39079f8345c7c9411
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
match the unsigned char type used by the zlib interface
ok stsp
- 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@