Got Mirror

Commits

Commit:: 7154f6ce0618e7d8582cd42d577f01cbc3c18d16
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 08:22:15 2019 UTC

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Commit:: 1430b4e093e8dcc1a214e26991cd06d3992db829
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 07:18:28 2019 UTC

treat 'add vs add' on update as a text conflict for now

diff | patch | tree

Commit:: 71a293558dcac7d17b10ae63f911aaf3f5b30df2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 06:48:54 2019 UTC

fix behaviour when 'got rm' is used twice

diff | patch | tree

Commit:: 5c99ca9fe447187c440a413772fb14201f30a1d2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 06:41:37 2019 UTC

fix behaviour when 'got add' is used twice

diff | patch | tree

Commit:: 031a5338903e1e2bbb80b6f1e17d58a5a6374271
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Mar 26 09:46:18 2019 UTC

make got_worktree_schedule_add() report 'added' via status_cb

diff | patch | tree

Commit:: 2ec1f75bbb4d6fb8f39613e5012392bae851aa8b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Mar 26 09:35:33 2019 UTC

add a basic implementation of 'got rm'

diff | patch | tree

Commit:: d00136be1116f6f2147a0984ac8461a1b19d11f6
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Mar 26 08:03:53 2019 UTC

implement a basic 'got add' command

diff | patch | tree

Commit:: 6c7ab9213e39b6a690152fe8ffb18fe1f15a9ccb
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 18 15:48:18 2019 UTC

introduce got_worktree_resolve_path()

diff | patch | tree

Commit:: ddcd8544ed03d513d539a972b05a2c0140b48b90
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 18:57:53 2019 UTC

move worktree-specific error handling out of got_path_mkdir()

diff | patch | tree

Commit:: 0647c5632b63a9e72b2b15674297b10429322f97
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 18:28:47 2019 UTC

remove path portion from worktree base commit ref name

diff | patch | tree

Commit:: 517bab732f80f5ecc6af2ffcfe6fe1e363303c01
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 18:12:16 2019 UTC

deduplicate code for constructing a worktree's base ref name

diff | patch | tree

Commit:: 0c48fee25cfbd876833d857ed3810028847225b0
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 17:15:28 2019 UTC

refuse to create got worktree at a git repo path

diff | patch | tree

Commit:: 0cd1c46a9e4b3e3a7c7f2947c3eded6fb5439516
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 17:08:58 2019 UTC

create references to base commits of got worktrees

diff | patch | tree

Commit:: f02eaa22e5963774a1ad9810e415ab201552ec8c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Mar 11 13:58:06 2019 UTC

better error if .got directory is missing files

diff | patch | tree

Commit:: bd16594452e51341979fbbc89cba33b7541b1586
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Mar 10 14:56:38 2019 UTC

plug memleak in got_open_worktree()

diff | patch | tree

Commit:: c442a90d575144387b9e5e1c769ba935013bbc71
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Mar 10 14:55:28 2019 UTC

read UUID back from work tree meta data

diff | patch | tree

Commit:: ec22038e8d0a46e692c6093e0a35503f4af398d7
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Mar 10 14:47:27 2019 UTC

add a UUID to work tree meta data

diff | patch | tree

Commit:: 70a0c8ec6e6b62f44cf81a937107e64429ee5572
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Feb 20 09:35:33 2019 UTC

preserve permissions on merged files

diff | patch | tree

Commit:: 2a57020b374709058c3f812c2672f8f367ea46fa
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Feb 20 08:43:09 2019 UTC

clean up temp files if rename(2) fails

diff | patch | tree

Commit:: 65ad4e61087e708b8ec592c0ba5fe32955fcdc65
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Feb 20 07:37:01 2019 UTC

improve wording of a comment in merge_blob()

diff | patch | tree

Commit:: 80c5c120285b0b38cf25a37858e737047c570a98
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 19 12:38:08 2019 UTC

missing fread(3) error check in get_file_status()

diff | patch | tree

Commit:: d10c9b58e3940fc75fa5017eeb52111c2ff5ebf2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 19 12:23:04 2019 UTC

missing stat error check in read_meta_file()

diff | patch | tree

Commit:: 68c7693588c1316ee15664810fb8b0f06b912e1f
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 19 12:20:39 2019 UTC

update cached timestamps of files left unmodified after a merge

diff | patch | tree

Commit:: 3cbbd752fbb743b19cc6954d6256fed51c1eaf30
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 19 11:55:43 2019 UTC

fix get_file_status() for files larger than blob read buffer size

diff | patch | tree

Commit:: af54ae4ac103d1529bb5e06bfd22ed88d78fed29
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 19 11:03:13 2019 UTC

avoid cross-device rename(2) after 3-way file merge

diff | patch | tree

More ↓