Commits

Commit:
f10244c07ff073c7f69ecf2044ac34e85f0666a0
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix merging of files which contain a dot on a line by itself Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert
diff | patch | tree
Commit:
2c9e323b3e6b33240740c40bbef58acdae141b56
From:
Stefan Sperling <stsp@stsp.name>
Date:
speed up 'got histedit -l' and 'got rebase -l' Cache commit timestamps in struct got_reference in case we are sorting references by commit timestamp. This avoids opening and closing commits every time we compare two references with each other. ok thomas.adam
diff | patch | tree
Commit:
51ed7429eaf94d2ab0dfa3f248549b2279c7e5d6
From:
Stefan Sperling <stsp@stsp.name>
Date:
align 'diff -c' usage help with synopsis given in man page; suggested by naddy
diff | patch | tree
Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@
diff | patch | tree
Commit:
138e4f4798d5a09e2b97c9a18e49999fb8ff599b
From:
Stefan Sperling <stsp@stsp.name>
Date:
display the requested object type when an object could not be found ok millert@
diff | patch | tree
Commit:
8f83a2643c211f21ec5731e80ebcb6218f7c6689
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove code which was setting up repo_path redundantly from cmd_diff()
diff | patch | tree
Commit:
237cfda12ceeaf6741ae34b166118631ffd35a80
From:
Stefan Sperling <stsp@stsp.name>
Date:
make got_repo_match_object_id() filter tags by the requested object type Potentially this function could return objects of a type that was not requested. Problem found by code inspection. This change does not affect any of our existing tests.
diff | patch | tree
Commit:
8cb8da5b6d133f8130a9e4e828ca00ff0bb482ca
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
document "mg" as alias for the "merge" command
diff | patch | tree
Commit:
c1e86b1d5bb299f6bcc93a8024575a12da339286
From:
Stefan Sperling <stsp@stsp.name>
Date:
add an xfail test for a bug in merging content with a dot on a line by itself
diff | patch | tree
Commit:
09209b8a13411e9d8464267c5e65c2c848455496
From:
Stefan Sperling <stsp@stsp.name>
Date:
add test for merge result when lines are inserted at the top of a file Based on a patch by Omar Polo
diff | patch | tree
Commit:
aaef19b43a34ed335737d733fbfea51056f2e2bb
From:
Stefan Sperling <stsp@stsp.name>
Date:
sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2
diff | patch | tree
Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn
diff | patch | tree
Commit:
f736d93a2da5b433c03766eee9f631af9dec2318
From:
Stefan Sperling <stsp@stsp.name>
Date:
link to the FastCDC paper from deltify.c; suggested by Ori some time ago
diff | patch | tree
Commit:
6eab69f730c8340837a82452cf8797251b3e69c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
make the number of elements in deltify's geartab explicit
diff | patch | tree
Commit:
b06f0b745c7a465de60c10ae2f0fffa84d56a221
From:
Klemens Nanni <kn@openbsd.org>
Date:
Ignore tags files OK stsp
diff | patch | tree