about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Expand)AuthorAge
* Fix color pairs once and for all v1June McEnroe2018-08-05
* Tabify sourceJune McEnroe2018-07-17
* Use stdio in merge and metaJune McEnroe2018-03-05
* Rename Tile timestamps {create,modify,access}TimeJune McEnroe2018-03-05
* Undef COLOR_ constants in torus.hJune McEnroe2018-03-05
* Remove leading blank linesJune McEnroe2017-09-27
* Relicense AGPLJune McEnroe2017-09-03
* Clean up merge toolJune McEnroe2017-08-31
* Choose B for tiles with equal modify timesJune McEnroe2017-08-31
* Add quick data file merge toolJune McEnroe2017-08-31
: make sure to send http headersChristian Hesse 2015-08-13Makefile: make "git/config.mak.uname" inclusion optionalJohn Keeping 2015-08-13ui-shared: show full date in tooltip if longer ago than max_relativeJohn Keeping 2015-08-13ui-shared: use common function in print_rel_date()John Keeping 2015-08-13ui-shared: extract date formatting to a functionJohn Keeping 2015-08-13filter: don't use dlsym unnecessarilyJohn Keeping 2015-08-13ui-tree: use "sane" isgraph()John Keeping 2015-08-13cgit.h: move stdbool.h from ui-shared.hJohn Keeping 2015-08-13cache.c: fix header orderJohn Keeping 2015-08-13configfile.c: don't include system headers directlyJohn Keeping 2015-08-13Remove redundant includesJohn Keeping 2015-08-13Makefile: include Git's config.mak.unameJohn Keeping 2015-08-13tests: allow shell to be overriddenJohn Keeping 2015-08-13redirect: cleanlinessJason A. Donenfeld 2015-08-13redirect: be more careful for different cgi setupsJason A. Donenfeld 2015-08-12ui-log: fix double countingJohn Keeping 2015-08-12log: allow users to follow a fileJohn Keeping 2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld 2015-08-12filters: apply HTML escapingLazaros Koromilas 2015-08-12git: update to v2.5.0Christian Hesse 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt