Commits
- Commit:
1a70a2078b605112beede15564122b377eeba92d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
consistently mention 'got merge' as an alternative to 'got rebase' in got.1
- Commit:
79878eb8ee8fb9380505ae4a7a252cf38dc273d2
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
histedit, rebase: document -c, -C are compatible
- Commit:
dcd455ee64953215a90ed4427762b5566d7e0047
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix option processing for 'got merge'
Don't make -C imply -c (a break statement was missing). Detect -an and
-cn conflicts. Simplify by removing unneeded check for conflicting -aC
(since -C requires -c, we can rely on the -ac conflict being detected).
Update the man page to say -cC is allowed.
- Commit:
31009ade0db15d36e637f180ba64b28110b25208
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
862951558c077adda5fda148c1666216da6d0edf
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
typo
- Commit:
1fa75a87f7cf94849260387869faae04e32a6f2a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tweak wording in got.1 which suggested that use of rebase was mandatory
- Commit:
f357763f32830a6499489869d8501ddd01f9c3e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
explain why the first 'got clone' example in got.1 will often fail
- Commit:
0b83b8f6353b650215b9bca597657608dcbe8a9d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide a 'got merge' example in the EXAMPLES section of got.1
- Commit:
4434a15a4719fdf3ae54026f89dc2c9fc8692d16
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james
- Commit:
b21ebdb07f917bc6e7026654dfbcddc6d3162383
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got add' more forgiving about unversioned paths on the command line
When users run 'got add *' the shell may pick up already versioned files
and trigger errors about paths being in an unexpected status. Expand the
check which previously only allowed files in added status to be double-added
to cover the following status codes which are all safe to ignore: A M C m
This should make bulk additions of files a bit easier in most cases.
Problem reported by robert@
ok jamsek
- Commit:
2b72f32d6817b003f88452592f304c2e114617be
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Implement fast-forward merges.
Split part of got_worktree_merge_prepare into a new function,
got_worktree_merge_write_refs, since that part doesn't make sense in the
fast-forward case.
ok stsp@
- Commit:
f2afb89d51ee41bbafec1feba57e50bf362c75dd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show how to fetch a pull request in got.1 pull request example section
- Commit:
1678610c6d5112a48cd47219c8bd4ef423d31e63
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
allow no-op merge commits to be created
Requested by James Cook
- Commit:
9f32321217acc7223f02908d236a292f3fe3f2af
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
handle files changing into directories during 'got update'
problem found by naddy@
- Commit:
bbf6b41827fdaa1e6b99aac193ffbc55305afbd3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: list all options which can be used to generate a histedit script
- Commit:
71654e8d472918dcc6ad677673c1da09d68a4d37
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Apply 'histedit -e' wording tweak from James Cook, thanks!
- Commit:
49f76ad0c2bd708657aeec16ca8a330dac21ddca
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
in got.1, clarify what users are expected to do during 'histedit -e'
Gap in the documentation pointed out by James Cook.
- Commit:
f8da67e8340977371b6ec3114502ae8baa5dee1f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set
ed users are reading files with their minds rather then their eyes, and
might therefore be missing important visual clues we write into files
before the user gets to edit them. Use of vi(1) ensures that such clues
will not be missed.
- Commit:
1b5d300f3ff325202e42e0a05b1f23f1d8b8e839
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
have ignore patterns with trailing slashes match directories only
ok jamsek
- Commit:
be94c03278021d1c6dbcd4a9b53014432f48ae4a
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add ci/he/mg/rb -C option to commit unresolved conflicts
As per stsp's suggestion and building on his initial diff, add the -C option
to enable creating commits with unresolved conflicts to the commit, histedit,
merge, and rebase commands to allow continuing the operation despite files in
conflict status. Also, only search for conflict markers in newly added lines
to enable working with files already under version control that may have
conflict markers embedded verbatim.
lots of tweaks, improvements, and initial diff + ok stsp@
- Commit:
7abf18632acc87a9e98668077a1af3d132bd2853
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: further fetch tweaks to prevent unintended fetches
Implement stsp's suggestion to only fetch remote's HEAD if the symref
refs/remote/*/HEAD exists, and its target no longer matches the remote
HEAD. This ensures users tracking a project won't miss a change in HEAD,
while also fixing the issue reported by naddy where HEAD was fetched by
default even though a specific, potentially less active, branch is cloned,
resulting in a repository with more commits than necessary.
In addition, unless 'got fetch -b <branch>' is used, the remote HEAD branch
will be fetched if branches are not set in got.conf and there is no work
tree to ascertain a branch, or said branches are not found on the server.
ok stsp@
- Commit:
7917d6d59bbefd910c6facb73b6deaaa17ab7399
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
backout got: always fetch remote HEAD except when -b is used
As pointed out by naddy, this behaviour is not ideal when users
want to limit their repository to a particular branch which will
diverge from HEAD over time, such as -stable branches.
See https://marc.gameoftrees.org/mail/1676388048.8632_0.html
- Commit:
81c8e458ff6b92cd522cd5700131467645a21204
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: always fetch remote HEAD except when -b is used
Rather than only fetch HEAD when there are no branches set in got.conf and
there is no branch to be inferred from a work tree, or said branches don't
exist on the server, always fetch HEAD unless 'got fetch -b branch' is used.
ok stsp@
- Commit:
fbbd3dd5aead1c3d4e05364dafed5c1716fbc05d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: tweak commit -A description. ok jamsek
- Commit:
e0380e3dfa71712eaaf9642b4d86b53e6a986653
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
special case 'got fetch -b <branch>' to only fetch <branch>
As discussed on irc, this drops the implicit remote HEAD fetch when -b is used.
got.1 has been updated to make the new fetch behaviour clear.
ok stsp@