Commits
- 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@
- Commit:
5daf5c53287d227ebc29ad1b0d934b4731ad5990
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a way to ignore author and remote repository info found in Git config files
ok op@
- Commit:
408db73d08e36bce6cbc5780738f3517b1297ee1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make mandoc -T lint got.1 happier; pointed out by Mark Jamsek
- Commit:
d4dddcbf5ea08034898e5d6dda70b9a82f8274fa
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document use of GOT_AUTHOR by 'got rebase' and 'got histedit'
- Commit:
4ff74dcfee7526b4f11621124178bee90acdbe08
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document pull request workflow in got.1 man page
With permission from Jelmer Vernooij to use my pull request config
for Dulwich, and Jelmer's name, as a real-life example.
ok tracey, jamsek
- Commit:
18d1acaddba2a6012509c2de642867984e27dbf4
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got commit: add flag to specify the author
This adds a new flag, `got commit -A', that allows to specify the commit
author but retains the "committer" (which is obtained as usual via
GOT_AUTHOR, got.conf or git config.)
with lots of help from and ok stsp
- Commit:
f3a5718ad6976d26b5d9c67cbeb73ea10def0990
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use Cm mdoc markup for histedit script commands
- Commit:
d4331337c16d79089a4d73dcf68d13eaf565c39b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
condense info about histedit mesg command being valid only with pick or edit