Commits
- Commit:
070c80a59d5048ca05990df52d7993f3015c2ee4
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: add 'got histedit -d' flag to drop all commits
Like -f, except drop all commits. Discussed with op and stsp on irc.
ok stsp@
- Commit:
95e6f77e2d30d9c6339f365844d53501d9f07daf
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
7e710171ff462556367f78cf01da0ca2b0dca532
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- Commit:
52d3950d946675a5906325e0b89bda875160ff4c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- Commit:
f6cd0243250112471da1212a1549007367cc32a7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: load editor with backout/cherrypick commit log messages
Create new logmsg references used to populate the editor with the log messages
of backed-out and cherrypicked commits when 'got commit' is run. We use
versioned path state heuristics during revert and commit commands in an effort
to ensure the editor is only populated with the log messages of backed-out
and/or cherrypicked commits involving paths with local changes that are being
committed. This is an implementation of an initial idea and algorithm designed
by stsp.
inputs, improvments and ok stsp@
- Commit:
bd15e8743449326cd8804a431fae3c2183344ea1
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sort ENVIRONMENT entries in got.1 and tog.1
ok jamsek
- Commit:
be97ab03efd83aac37b83f2df2dea936213b456c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
refactor got log -d and tog diffstat to compute diff once
This eliminates the previous performance cost by making 'got log -d' and tog
diff view compute the diffstat while building the diff in a temp file like we
do with 'got diff -d'. Also, keep the current 'got log -d' UI as per stsp's
suggestion.
ok stsp@
- Commit:
7fc9410615d293f182da728eb3576f2e228cbfcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: Add example which lists recently modified branches. I use this a lot.
- Commit:
53d03f970a594ed205147f847c825c9b4752c3fd
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: expand diffstat -d option to 'got diff'
Like got log -d, add the switch to 'got diff' to display a diffstat of changes;
as per stsp's suggestion, we always include diff output with the diffstat.
Disabled in gotwebd (for now :) Includes tweaks from op@
ok stsp@
- Commit:
8bcebf69377a87cb57378dd59d494c7338b0d399
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
in got.1, update list of commands which refuse to run during rebase/histedit
- Commit:
f3ad4b0a2ba1fd3f0c3f54b3f506585b0570d1b1
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -d switch to log usage and sort lexicographically
patch by Josiah Frentsos
- Commit:
772fcad51433f2ecbfaea38a78e02d07ed1eef7f
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: implement diffstat for got log and tog diff view
Add new got_diff_blob_cb() implementation to compute added/removed line metrics
for a given diff. This enables displaying a diffstat with 'got log -d'. As per
suggestion from stsp, change tog diff view to display the diffstat by default.
ok stsp@
- Commit:
85c360aaa1efe49063956a1fdfd7e46d8e5a92b3
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
farewell, gotweb. you served us well. rm gotweb, ok stsp@
- Commit:
86f8a176f07f038b900de4be6e5b8fa6b0ae6221
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add missing full-stop; patch by Josiah Frentsos
- Commit:
ef899790595636e3d4729e14971ad2843156dba9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide a diff of changes in a temp file while editing a commit log message
ok landry@
- Commit:
0a58e7222f591acd7479040f317f1e0e0e9d132e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync usage with reality
The -h and -V/--version flags must be given before the command; with
those flags the command is actually optional, but don't over-complicate
the usage string with these nitpicks.
ok/improvements stsp@
- Commit:
e9424ba1b8bca2f931b594e9afef1192ad5cce27
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add gotadmin init -b <branch> to specify repo head ref
Similar to `git init -b`. Includes a change to `got import` behaviour such that
"main" is no longer hardcoded by default; instead, we import to the branch
resolved via the repository's HEAD reference unless `got import -b` is used,
and only if HEAD cannot be resolved to a branch do we fallback to "main".
includes fix plus ok from stsp@
- Commit:
8dbcf3885ae920e0fd38a455e7577824989a605f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
forbid rebase of references outside the refs/heads/ namespace
ok jrick
- Commit:
b6b86fd1b9828e38d59915e62fddce62952b8b75
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
56c96effe18fb1b735a043dae4ba93b8d486e7ca
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use Xo/Xc in the man pages
Patch by Josiah Frentsos; ok kn@
- Commit:
b6bfeb85557195c11514ad96b30ce83da839b708
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got(1): Replace 'Ar sign' with 'Cm sign'
Cm sign matches the markup used in the ssh-keygen(1) man page.
Patch by Josiah Frentsos
- Commit:
d6506a3d8fbcc06720765fc488978d6ad81202d4
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Group options in accordance with style(9)
patch by Josiah Frentsos
- Commit:
82a8b7ecf5c23c6bb7dc0b1bf17d5608316834f9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rework got patch -c documentation
ok op@
- Commit:
ef0937d6aa633a60c254ef9ab536c2da4ac6ac14
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
warn about the interaction between got patch -p and -c
suggested by stsp@
- Commit:
7d8bcb99cc69666c8317a8c1cadc8dc5885a7a77
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: add -c flag to apply at a specified commit
it's useful for e.g. to apply old patches that weren't generated by `got
diff' or git-diff(1) and so lacks the metadata needed for the 3-way
merge.
manpage improvements from and ok stsp@