Timeline
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

21 check-ins using file src/main.c version 297817f7e7

2012-10-02
22:59
Merge the enhancements that adds the "diff-binary" setting for passing binary files to the external diff program. check-in: f8339c2743 user: drh tags: trunk
2012-09-30
09:29
The 'binary-glob' setting is a versionable project setting and should be listed with the others. check-in: 6ef41eeffe user: mistachkin tags: trunk
07:39
Make sure the new command line options are always processed; however, wait until after the settings are available. Closed-Leaf check-in: 064afb225a user: mistachkin tags: diffBinExternal
06:25
Add support for skipping binary files when using an external diff program. The existing 'binary-glob' setting and new 'diff-binary' boolean setting control this feature. check-in: c50eb50718 user: mistachkin tags: diffBinExternal
01:43
Fix typo in comment. check-in: 97f68e61da user: mistachkin tags: trunk
2012-09-29
14:08
Make the "--tk" option to the "diff" command also imply the "-i" option to force the use of the internal diff engine. check-in: 5a4fbb0a28 user: drh tags: trunk
2012-09-28
13:45
merge trunk check-in: 1aed9aabaa user: jan.nijtmans tags: use-utf8-in-win-external-editor
10:18
Update to the latest SQLite amalgamation, for the purpose of testing recent changes in SQLite. check-in: c0f245de25 user: drh tags: trunk
07:26
load Tcl dynamically using the Stubs mechanism in stead of linking in the library statically. Closed-Leaf check-in: ba91fe5f9e user: jan.nijtmans tags: stubbed-tcl
2012-09-27
21:16
Merge the partialCommitPerms branch which fixes an issue with permission bit changes of non-specified files being picked up by a partial commit. check-in: a0da8b3873 user: drh tags: trunk
17:29
Update the pre-checkin checklist to talk about the new --tk option to the diff command. check-in: 394177917c user: drh tags: trunk
13:02
Merge the fix for [711d04b6d8577] into trunk. Only bail out of a commit if none of the selected files have changed, rather than if any selected file is unchanged. check-in: 3a5e81cedb user: drh tags: trunk
11:51
Alternative fix for ticket [711d04b6d8577]. Closed-Leaf check-in: 94e2deef6d user: drh tags: ticket-711d04b6d8
08:43
Candidate fix for ticket [711d04b6d8] check-in: eab9f88e7f user: jan.nijtmans tags: ticket-711d04b6d8
01:38
Fixes to the --tk diff option to support unified diff on Windows. check-in: 1048bccf14 user: mistachkin tags: trunk
00:37
Allow unified diff for the --tk diff option. check-in: 5be507df71 user: mistachkin tags: trunk
2012-09-26
14:11
merge check-in: 84f1b5b37f user: jan.nijtmans tags: trunk
14:10
Make "fossil diff --tk" work on Windows as well. check-in: b836ec8a35 user: jan.nijtmans tags: trunk
13:52
For the --tk option to the diff command, invoke "tclsh" instead of "wish" and invoke "package require Tk" at the beginning of the script. check-in: aba451e9d5 user: drh tags: trunk
12:55
Add the --tk option to "fossil diff" in order to launch a Tcl/Tk GUI display of colorized side-by-side diffs. check-in: 22e5d711e5 user: drh tags: trunk
11:59
Add the --baseurl open to the "fossil server" and "fossil http" commands, for use with reverse proxies such as nginx. check-in: ecb85f61a9 user: drh tags: trunk