about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Expand)AuthorAge
* Shrink the torus and rearrange struct TileJune McEnroe2018-08-21
* Fix color pairs once and for allJune 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
d class='logsubject'>git: update to 1.9.2Christian Hesse Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required. 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice For example, if I have two repos (remove-suffix is enabled): /foo /foo/bar http://cgit/foo/bar/ is interpreted as "repository 'foo', command 'bar'" instead of "repository 'foo/bar'" 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse