Commits

Commit:
98ec424553c524789a56753ff641281548b6ac61
From:
Stefan Sperling <stsp@stsp.name>
Date:
add test coverage for tog displaying a symlink
diff | patch | tree
Commit:
eef262f386912f13169c1d74b77732bce4524cfd
From:
Tracey Emery <tracey@traceyemery.net>
Date:
Fix for cc1: warnings being treated as errors /home/got/src/got/tog/tog.c: In function 'draw_tree_entries': /home/got/src/got/tog/tog.c:7307: warning: comparisons like X<=3DY<=3DZ do = not have their mathematical meaning
diff | patch | tree
Commit:
ba91039c1a0a3d55f4850e26c24730cbf4b5c239
From:
Omar Polo <op@omarpolo.com>
Date:
add kill_repo_proc() similarly to the other kill_*_proc() ok stsp@
diff | patch | tree
Commit:
f25e229e88a01c4a65fa80f4d5e35cd34309cbf9
From:
Stefan Sperling <stsp@stsp.name>
Date:
reword user-facing error message which mentions "fast-forward" For user-facing messages it is better to avoid technical jargon like this and instead spell out what the fast-forward situation implies: that one branch is already based on another. ok jamsek
diff | patch | tree
Commit:
9c8a62dba4cf8662616c66f8fa0c53d1000ecf40
From:
Mark Jamsek <mark@jamsek.dev>
Date:
typo
diff | patch | tree
Commit:
a328bb1b14dfe7d99e5d66c3fab2d5ebe4c4119a
From:
Omar Polo <op@omarpolo.com>
Date:
missing semicolon... sigh I can't assume I can blindly add one simple line.
diff | patch | tree
Commit:
c929736a36ab9616de454d901bd908e0c9512a26
From:
Omar Polo <op@omarpolo.com>
Date:
move gotd_child_proc to gotd.c make it opaque since it's unused outside of gotd.c. While here, drop the unused `nhelpers' field. ok/tweak stsp@
diff | patch | tree
Commit:
a60eb2cc0fad47d21b6c6329245e25f548245c00
From:
Stefan Sperling <stsp@stsp.name>
Date:
tweak wording in got.1 which suggested that use of rebase was mandatory
diff | patch | tree
Commit:
de25a6106ad608b69412c95fa0c4affe6c8c3ac6
From:
Stefan Sperling <stsp@stsp.name>
Date:
explain why the first 'got clone' example in got.1 will often fail
diff | patch | tree
Commit:
77a54eed10d82b08ac3902b29ff491ef053169ca
From:
Stefan Sperling <stsp@stsp.name>
Date:
provide a 'got merge' example in the EXAMPLES section of got.1
diff | patch | tree
Commit:
1334230721068ac62f5ea69c359962cdedb4df60
From:
Stefan Sperling <stsp@stsp.name>
Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/" ok op, james
diff | patch | tree
Commit:
b73055ebbea59457c1aef2cf7c473ea2898b434b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make installation prefix info more visible in README
diff | patch | tree
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
diff | patch | tree
Commit:
9fc9df27559545b0cacca46fc6d8db711fdcaf41
From:
Stefan Sperling <stsp@stsp.name>
Date:
expand test coverage of test_double_add a bit more
diff | patch | tree
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@
diff | patch | tree