Fossil

Check-in [9686570a]
Login

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

Overview
Comment:Tweak changes's help text
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:9686570ab5c2f52a253bb149888cda62c7b7240e
User & Date: andygoth 2016-11-08 00:38:47
Context
2016-11-08
14:21
Make "fossil extra" work as expected in fossil repository: not mentioning build-artifacts any more. This makes sure that files resulting from a build cannot be accidently "fossil add"-ed any more. check-in: 6ef3a2a4 user: jan.nijtmans tags: trunk
00:38
Tweak changes's help text check-in: 9686570a user: andygoth tags: trunk
2016-11-07
11:26
Fix the sync.wiki documentation to account for recent changes to the sync protocol. check-in: df1205bb user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
** If the file had to be merged with any other changes, it is considered
** to be merged or conflicted and therefore will be shown by --edited, not
** --updated, with types EDITED or CONFLICT.  The --changed option can be
** used to display the union of --edited and --updated.
**
** --differ is so named because it lists all the differences between the
** checked-out version and the checkout directory.  In addition to the
** default changes (besides --merge), it lists extra files which (assuming
** ignore-glob is set correctly) may be worth adding.  Prior to doing a
** commit, it is good practice to check --differ to see not only which
** changes would be committed but also if any files need to be added.
**
** General options:
**    --abs-paths       Display absolute pathnames.
**    --rel-paths       Display pathnames relative to the current working
**                      directory.
**    --sha1sum         Verify file status using SHA1 hashing rather than
**                      relying on file mtimes.







|


|







400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
** If the file had to be merged with any other changes, it is considered
** to be merged or conflicted and therefore will be shown by --edited, not
** --updated, with types EDITED or CONFLICT.  The --changed option can be
** used to display the union of --edited and --updated.
**
** --differ is so named because it lists all the differences between the
** checked-out version and the checkout directory.  In addition to the
** default changes (excluding --merge), it lists extra files which (if
** ignore-glob is set correctly) may be worth adding.  Prior to doing a
** commit, it is good practice to check --differ to see not only which
** changes would be committed but also if any files should be added.
**
** General options:
**    --abs-paths       Display absolute pathnames.
**    --rel-paths       Display pathnames relative to the current working
**                      directory.
**    --sha1sum         Verify file status using SHA1 hashing rather than
**                      relying on file mtimes.