Commits
- Commit:
7b53188e4c59d5ce295c92624cacdeee16881abd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently mention 'got merge' as an alternative to 'got rebase' in got.1
- Commit:
a6c2ea42da6e1783b7d7d50693d18a4c778cde18
- From:
- James Cook <falsifian@falsifian.org>
- Date:
histedit, rebase: document -c, -C are compatible
- Commit:
18877383a0d783b0b642a27b16ccd3d1a212c8a3
- From:
- James Cook <falsifian@falsifian.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:
481cdc746b012203f39047cbc55f8b65ae40d046
- From:
- James Cook <falsifian@falsifian.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
9c8a62dba4cf8662616c66f8fa0c53d1000ecf40
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
typo
- Commit:
a60eb2cc0fad47d21b6c6329245e25f548245c00
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak wording in got.1 which suggested that use of rebase was mandatory
- Commit:
de25a6106ad608b69412c95fa0c4affe6c8c3ac6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
explain why the first 'got clone' example in got.1 will often fail
- Commit:
77a54eed10d82b08ac3902b29ff491ef053169ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
provide a 'got merge' example in the EXAMPLES section of got.1
- Commit:
1334230721068ac62f5ea69c359962cdedb4df60
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james
- Commit:
b88936d3f94e26ab32d9ef5d893b39fe633c6485
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
179f9db092046395efaa1dc9e767a1ec109e1174
- From:
- James Cook <falsifian@falsifian.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:
0ffe39b0c5a0f782cded7ffb2154b89a1c3c2086
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show how to fetch a pull request in got.1 pull request example section
- Commit:
35d2583f834a66f801dc229002d45e735882ba78
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow no-op merge commits to be created
Requested by James Cook
- Commit:
07fa936579660934e2b84e747df1d21810278e11
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle files changing into directories during 'got update'
problem found by naddy@
- Commit:
e02ef4272327ac8f401337fc9e9f79963b2f0472
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: list all options which can be used to generate a histedit script