Commits
- Commit:
4e12cd97c02ae412c5a247dfaffa22ad58dd98b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
ef2f551e4634d795e79ad145eda2a1050f8b3cf9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -t option to 'got branch' synopsis in got.1 man page
- Commit:
f76670f06a0f4f426ea232a2dd02899fe3698cf2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
0f104432aecf1cda4672c5ff4e4d228f5aae1bdb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
4683a10b65c55ef32afba4f4363b9da42c396b6e
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix mandoc HTML rendering for command aliases
Replace hand-rolled parentheses with the proper mdoc(7) macro,
otherwise the closing ")" ends up inside the command description.
Reported by Josh Rickmar, thanks!
- Commit:
2af6173593a21a43c9ee858646ac68d812039e12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document new 'got rebase' behaviour when commits do not need to be rebased
- Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
8cb8da5b6d133f8130a9e4e828ca00ff0bb482ca
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
document "mg" as alias for the "merge" command
- Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- 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:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- 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:
088449d31db27c8682d5e9dc737d92d05df6605e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to merge vendor branches with 'got merge'
- Commit:
f365d76274ee1ae2b57225686a0733176fc4bfb2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
stop using the term 'obstructed' ambiguously in the got.1 man page
Specifically, obstructed files are versioned files which should be on disk
but have been replaced on disk by a non-regular file (e.g. by a directory).
The man page used the phrase "deletion was obstructed" which is unrelated
to the above concept and can be expressed as "deletion was prevented" instead.
- Commit:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
- 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
- Commit:
ac372b601e0be8eb794f071912ddb1efc81ea8a8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
'got status' does not have a -q option; remove it from got.1 synopsis
- Commit:
df7dea6e70ae149a51b80d537544c007bdb03258
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -S option to 'got status' synopsis in got.1 man page
- Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got status -s and -S options conflict
- Commit:
00357e4dc78f7f5bd12eceaa07592ab743996e12
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add suppress status-code selection to got status. this allows for a quick way to
clean output without the use of ignore files. ok stsp