summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #164 from david-geiger/masterHEADorigin/masterorigin/HEADmasterBenjamin Pierce2018-02-261-2/+2
|\
| * Fix for lablgtk >= 2.18.6daviddavid2018-02-261-2/+2
|/
* Merge pull request #152 from g-raud/uitext-tweak-actionsBenjamin Pierce2018-02-091-2/+6
|\
| * Uitext: print the number of items skipped for "forward" and "backward"G.raud2018-02-061-2/+6
* | Merge pull request #158 from bcpierce00/update-docsBenjamin Pierce2018-02-091-0/+17
|\ \
| * | Add some recent improvementsBenjamin Pierce2018-02-091-0/+17
* | | Merge pull request #157 from g-raud/better-server-failureBenjamin Pierce2018-02-091-4/+6
|\ \ \
| * | | Main: catch and transform exception IllegalValue from the server into FatalG.raud2018-02-081-3/+5
| * | | Main: make it clear that it is the server that failsG.raud2018-02-081-1/+1
* | | | Merge pull request #148 from g-raud/uarg-fix-parse-cli-optionsBenjamin Pierce2018-02-094-15/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Prefs.parseLines: factorize by calling Util.splitAtFirstCharG.raud2018-02-051-10/+9
| * | | Uarg: do not discard an empty value following the optionG.raud2018-02-021-4/+4
| * | | Uarg: fail cleanly when a value to an option has not the expected typeG.raud2018-02-021-3/+6
| * | | Uarg: fix parsing of equal sign '=' following command line option namesG.raud2018-02-021-2/+2
| * | | Util.splitAtFirstChar: new functionG.raud2018-02-012-0/+9
| |/ /
* | | Merge pull request #149 from g-raud/logfile-relative-to-homeBenjamin Pierce2018-02-093-2/+9
|\ \ \
| * | | Update trace.mlBenjamin Pierce2018-02-091-1/+1
| * | | Trace: root a relative logfile parameter to home and not to cwdG.raud2018-02-011-2/+3
| * | | Util.fileMaybeRelToHomeDir: new functionG.raud2018-02-012-0/+6
| |/ /
* | | Merge pull request #154 from g-raud/uitext-matching-boolean-rpnBenjamin Pierce2018-02-091-115/+325
|\ \ \
| * | | Uitext: new action "pop" to pop a matching conditionG.raud2018-02-051-2/+8
| * | | Uitext: new actions "and" and "or" taking last 2 match in RPN styleG.raud2018-02-051-0/+12
| * | | Uitext.interact: enable setripred to also unset and modify ripredG.raud2018-02-051-27/+25
| * | | Uitest.interact: save previous ripred when setting a new oneG.raud2018-02-051-4/+3
| * | | Uitext.interact: make !ripred a list instead of an optionG.raud2018-02-051-11/+11
| | |/ | |/|
| * | Uitext: new action "backward"G.raud2018-02-051-4/+10
| * | Uitext: new action "forward"G.raud2018-02-051-0/+11
| * | Uitext: add some shortcuts to actions that matchG.raud2018-02-051-3/+3
| * | Uitext: print some messages when changing matchG.raud2018-02-051-7/+13
| * | Uitext: new action "changed" to resolve to the detriment of props changesG.raud2018-02-041-0/+6
| * | Uitext.interact: new subfunction setdirchangedG.raud2018-02-041-0/+9
| * | Uitext: make action "invert" print an message if change impossibleG.raud2018-02-031-1/+3
| * | Uitext.interact: in actOnMatching replace option discard with failG.raud2018-02-031-4/+7
| * | Uitext: prevent action "invert" from going next if direction not invertedG.raud2018-02-031-0/+1
| * | Uitext.interact: in actOnMatching let returned bool decide whether to go nextG.raud2018-02-031-3/+6
| * | Uitext.interact: add an option discard to actOnMatchingG.raud2018-02-031-4/+4
| * | Uitext: new action "invert" to invert the propagation directionG.raud2018-02-031-0/+4
| * | Uitext.interact: new subfunction invertdirG.raud2018-02-031-0/+6
| * | Uitext: add a few vi-like keybindingsG.raud2018-02-031-3/+3
| * | Uitext: new action to match PropsChangedG.raud2018-02-031-0/+5
| * | Uitext.interact: new subfunction ispropschangedG.raud2018-02-031-0/+7
| * | Uitext: fix for actions "details" and "diff" (do not go next and print newline)G.raud2018-02-031-2/+3
| * | Uitext.interact: tweak actOnMatching to accept functions that displayG.raud2018-02-031-4/+13
| * | Uitext: new action "not" to invert the match conditionG.raud2018-02-031-0/+7
| * | Uitext: new actions "start" and "end" to go to start or end of listG.raud2018-02-031-0/+10
| * | Uitext: let list actions list only matching itemsG.raud2018-02-021-4/+7
| * | Uitext.interact: document which actions operate on matching itemsG.raud2018-02-021-9/+9
| * | Uitext: new actions "1" and "2" to match according to directionG.raud2018-02-021-0/+16
| * | Uitext: let "skip" and "discard" operate on matching itemsG.raud2018-02-021-9/+8
| * | Uitext: let "newer" and "older" operate on matching itemsG.raud2018-02-021-9/+6
| * | Uitext: let setting of direction operate on matching itemsG.raud2018-02-021-9/+5
| * | Uitext: let "revert" and "merge" operate on matching itemsG.raud2018-02-021-5/+6
| * | Uitext: let "diff" and "details" operate on matching itemsG.raud2018-02-021-7/+6
| * | Uitext: new actions to match against following itemsG.raud2018-02-021-0/+26
| * | Uitext.interact: new subfunction actOnMatchingG.raud2018-02-021-0/+11
| * | Uitext.interact: improve menu order (skip after reconcile)G.raud2018-02-021-11/+11
| * | Uitext.interact: improve menu order (list edit towards the end)G.raud2018-02-021-23/+23
| * | Uitext.interact: improve menu order (moving at the top)G.raud2018-02-021-14/+14
| * | Uitext.interact: improve menu order (info at the top)G.raud2018-02-021-25/+25
| * | Uitext.interact: improve menu order (quitting at the end)G.raud2018-02-021-13/+13
| * | Uitext.selectAction: improve menu descriptions (be consistent with interact)G.raud2018-02-021-2/+2
| * | Uitext.interact: improve menu descriptionsG.raud2018-02-021-4/+4
| * | Uitext: new action to revert then go backG.raud2018-02-021-0/+7
| * | Uitext: new action "revert" (as in Uigtk2)G.raud2018-02-021-0/+5
| * | Uitext: new action "next"G.raud2018-02-021-1/+5
| * | Uitext: new actions to skip or discard all followingG.raud2018-02-021-0/+9
| * | Uitext.interact: define a setskip subfunction to factorizeG.raud2018-02-021-2/+7
| * | Uitext: new shortcut to "skip"G.raud2018-02-021-1/+1
| * | Uitext: new action "reverse" (at the "reconcile" prompt)G.raud2018-02-021-0/+4
| * | Uitext: new action "discard"G.raud2018-02-021-0/+4
| * | Uitext: apply "newer" and "older" also to files that have been skippedG.raud2018-02-021-2/+5
| * | Uitext: new actions "newer" and "older" as in Uigtk2G.raud2018-02-021-0/+12
| * | Uitext.interact: define the diff display in a subfunction showdiffsG.raud2018-01-291-13/+15
| * | Uitext.interact: fix indentation and newlines of output of "l" and "L"G.raud2018-01-291-4/+2
| * | Uitext: place newLine as the first command in args to selectActionG.raud2018-01-291-21/+19
| * | Uitext: more style consitency in args to selectActionG.raud2018-01-291-48/+47
| * | Uitext: add missing newLine for cbreak modeG.raud2018-01-291-2/+3
| |/
* | Merge pull request #156 from g-raud/documentation-fix-backup-merge-atomicBenjamin Pierce2018-02-094-15/+19
|\ \ | |/ |/|
| * Recon: warn that the preference merge overrides preferG.raud2018-02-081-1/+2
| * Fix documentation: backupnot is not like ignorenotG.raud2018-02-081-3/+1
| * unison-manual.tex: describe how to skip a previously given mergeG.raud2018-02-061-0/+7
| * Globals: warn that the preference atomic is in effect only for conflictsG.raud2018-02-061-2/+3
| * Globals: warn that the preference atomic does not apply to backupcurrG.raud2018-02-061-1/+2
| * Globals: document that the preference atomic applies to backupsG.raud2018-02-061-2/+3
| * Stasher: document that the preference backup does not apply to directoriesG.raud2018-02-061-1/+2
| * Globals: improve the description of the preference mergeG.raud2018-02-061-2/+2
| * Fix documentation: merge paths are not backed upG.raud2018-02-062-7/+1
|/
* Merge pull request #142 from g-raud/dumbtty-fix-newlineBenjamin Pierce2018-01-291-3/+5
|\
| * Uitext.newLine: add a descriptive commentG.raud2018-01-281-0/+2
| * Uitext.interact: fix usage of newLine for dumbtty modeG.raud2018-01-281-3/+3
* | Merge pull request #141 from g-raud/manual-fix-build-commandBenjamin Pierce2018-01-291-2/+2
|\ \
| * | unison-manual.tex: fix the build commandG.raud2018-01-281-2/+2
| |/
* | Merge pull request #140 from g-raud/uitext-sortBenjamin Pierce2018-01-294-37/+61
|\ \
| * | Sortri: update the documentation of the parameter 'sortbysize'G.raud2018-01-281-2/+2
| * | Uigtk2: display in the menu that "sort new first" is a toggleG.raud2018-01-281-1/+1
| * | Uitext: add a "reverse sort" commandG.raud2018-01-281-0/+3
| * | Uitext: do not restart the selection after sortingG.raud2018-01-281-48/+52
| * | Uitext: add sort commands to the "proceed" promptG.raud2018-01-281-0/+17
| * | sortri.mli: mention that sortReconItems is a stable sortG.raud2018-01-281-3/+3
* | | Merge pull request #139 from g-raud/eintr-stdin-read-restartBenjamin Pierce2018-01-291-1/+1
|\ \ \