Commits
- Commit:
a0b48eaf75ca2f2a41f476012474a3d255c2e83d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
2bf0fa54a55e054ffe4c688f49ecbd6a28101fe0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
d912d1250c98cc9f95e6d51ebb86173911e17b81
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.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:
d10218e7512ce57d66ac7ef9f7a3caeab7874e8a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document new 'got rebase' behaviour when commits do not need to be rebased
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
bea5ae74558ed1bc5c8372306ead95c29c5bc362
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document "mg" as alias for the "merge" command
- Commit:
30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- Commit:
ac93b2c5ff1f2b9d2c10aaf6b385b22b9da35056
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Fix "mandoc -T lint -W style got/got.1" nits
- Commit:
e8aa341a0a112d2660938b2e9aec7ff327865ec6
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.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:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
22a38a4331904c508c1782e5399680ba7069300f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists
- Commit:
dddbe150a21f404e9c42033d9b00b5561001df7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
bb494413b7b04767e20fc5a04378d517cda008ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
8cf2970b6c6851169342b56a57bfe72560170f1a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document all reasons why 'got merge' might be interrupted
- Commit:
ba34626bc13877c93836c8ee873acf1be8429ead
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
768705e331a0ff020ecc806142aecdecdbfb2e89
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to merge vendor branches with 'got merge'
- Commit:
df3d7c3ef8853d0fa9182dd3f3023a4d5e222ce0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
10604dce6e625d11974fb5491598bbb54069e5d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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
- Commit:
4ad4a1ec452e58730b6d841ae6a044ff53827e15
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add -q quiet mode to checkout and update. supressing output keeps the terminal
responsive on large repos. ok jrick stsp
- 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