Commits

Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' display the worktree's branch name upon success ok tracey
diff | patch | tree
Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
From:
Stefan Sperling <stsp@stsp.name>
Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
diff | patch | tree
Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5
From:
Stefan Sperling <stsp@stsp.name>
Date:
merge new diff implementation from the git.gameoftrees.org diff.git repository This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.
diff | patch | tree
Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp
diff | patch | tree
Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey
diff | patch | tree
Commit:
75f0a0fb346fb0ad381536024728164cd32d2a7e
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop reinstalling symlinks after commit; 'got update' can handle that
diff | patch | tree
Commit:
35213c7c838a48142d398147b54bb9938af8cab0
From:
Stefan Sperling <stsp@stsp.name>
Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
diff | patch | tree
Commit:
fa3cef63799016195e8a917f39c82815522692aa
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got stage -p' work with symlinks
diff | patch | tree
Commit:
0aeb8099a04ea427eff4a7b6cb52b1cba62a87b0
From:
Stefan Sperling <stsp@stsp.name>
Date:
set a staged file type and handle it separately from the on-disk file type
diff | patch | tree
Commit:
c631b1152565e4c18cb2123e1d3d7c08d513c02f
From:
Stefan Sperling <stsp@stsp.name>
Date:
make staging of symlinks work
diff | patch | tree
Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
From:
Stefan Sperling <stsp@stsp.name>
Date:
show a summary of conflicts and related problems after updating/merging files ok millert@
diff | patch | tree
Commit:
7b5dc508da734468a2a01112b45b7999b55123ce
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix staging of multiple files with -p ok semarie
diff | patch | tree
Commit:
46f68b205b4ab514846c5352c6d952720b9da365
From:
Stefan Sperling <stsp@stsp.name>
Date:
show file mode differences when diffing trees
diff | patch | tree
Commit:
72fd46fa56e8a73262ff8901b7c93554b7bad3e6
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix modified files not shown by 'got status' after committing staged changes
diff | patch | tree
Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
From:
Stefan Sperling <stsp@stsp.name>
Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
diff | patch | tree