about summary refs log tree commit diff homepage
path: root/merge.c (unfollow)
Commit message (Expand)Author
2018-08-26Leave line mode with .June McEnroe
2018-08-25Add line modeJune McEnroe
2018-08-25Fix key code handlingJune McEnroe
2018-08-25Add .o rule for BSD makeJune McEnroe
2018-08-25Revert "Explicitly build from .o objects"June McEnroe
2018-08-25Remove -lmJune McEnroe
2018-08-25Explicitly build from .o objectsJune McEnroe
2018-08-25Implement map renderingJune McEnroe
2018-08-25Shrink mapJune McEnroe
2018-08-25Send now in mapJune McEnroe
2018-08-25Calculate min and max meta for map server-sideJune McEnroe
2018-08-24Fill in the help pageJune McEnroe
2018-08-24Always interpret space as spaceJune McEnroe
2018-08-24Separate 8, 9 and *, (June McEnroe
2018-08-24Add copy and pasteJune McEnroe
2018-08-24Add client-side help pageJune McEnroe
2018-08-23Remove helpJune McEnroe
2018-08-23Add g for flipJune McEnroe
2018-08-23Implement I, directional insertJune McEnroe
2018-08-23Add C-l to redrawJune McEnroe
2018-08-23Support CP437 in mergeJune McEnroe
2018-08-22Add ssh:// links to index.htmlJune McEnroe
2018-08-22Implement RJune McEnroe
2018-08-22Implement rJune McEnroe
2018-08-22Add F-keys to set shiftJune McEnroe
2018-08-22Add C-a and C-xJune McEnroe
2018-08-22Implement ` ~ and xJune McEnroe
2018-08-22Fix black-on-black once againJune McEnroe
2018-08-21Track cell{X,Y} client-side and implement swapsJune McEnroe
2018-08-21Maintain a tile client-side and support cursorsJune McEnroe
2018-08-21Replace client with rudimentary CP437 supportJune McEnroe
2018-08-21Use alignas rather than attributesJune McEnroe
2018-08-21Shrink the torus and rearrange struct TileJune McEnroe
2018-08-21Remove spawnsJune McEnroe
2018-08-21Clean up MakefileJune McEnroe
2018-08-05Fix color pairs once and for all v1June McEnroe
2018-08-05Add chat to index.htmlJune McEnroe
2018-07-25Set client sockets SNDBUF to twice tile sizeJune McEnroe
2018-07-24Revert "Do not set non-blocking on client sockets"June McEnroe
2018-07-24Print time_t with %jd in metaJune McEnroe
2018-07-24Do not set non-blocking on client socketsJune McEnroe
2018-07-24Use EV_SETJune McEnroe
2018-07-24Link with -lcursesJune McEnroe
2018-07-23Fix NaNs in serverMapJune McEnroe
2018-07-22Add libm.so to chroot.tarJune McEnroe
2018-07-22Link with -lmJune McEnroe
2018-07-22Add map to clientJune McEnroe
2018-07-21Refactor readInput for each modeJune McEnroe
2018-07-19Add ARRAY_LEN macroJune McEnroe
2018-07-17Add server map generationJune McEnroe
'nohover-highlight'> Use suffixcmp() from Git instead of reimplementing it. This is a preparation for moving to ends_with() in Git 1.8.6. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer Use Git string lists instead of str{spn,cspn,ncmp}() magic. This significantly improves readability. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer Since the introduction of selective snapshot format configuration in dc3c9b5 (allow selective enabling of snapshots, 2007-07-21), we allowed seven different delimiters for snapshot formats, while the documentation has always been clear about spaces being the only valid delimiter: The value is a space-separated list of zero or more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Supporting the undocumented delimiters makes the code unnecessarily complex. Remove them. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-09README: Fix dependenciesLukas Fleischer * Remove the dependency on Git (which can be obtained automatically when building, using either the Git submodule or `make get-git`). * Use proper upstream names of dependencies. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08README: Spelling and formatting fixesLukas Fleischer * Several small spelling and capitalization fixes. * Use consistent and better-looking formatting that is compatible with AsciiDoc (and partly compatible with RST). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch Previously the script tried to encode output from Pygments with the ASCII codec, which failed. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Add a suggestion to the manpagePřemysl Janouch So that people wishing to use "enable-http-clone" don't have to find out the correct settings on their own. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix the example configurationPřemysl Janouch "enable-git-clone" doesn't exist, replaced with "enable-http-clone". Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix about-formatting.shPřemysl Janouch dash failed to parse the script. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix some spelling errorsPřemysl Janouch Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts