GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Documentation Update

Browse source 
- Fixed typo in copyright.
- Added new feature to NEWS file.
- Added 'merge.autopush' as a valid configuration variable.
This commit is contained in:
Paul Beckingham 2010-09-01 22:39:37 -04:00
parent 4d46be0767
commit 04ddf74a07
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -15,6 +15,7 @@ New Features in taskwarrior 1.9.3
instead of the day after the due date. instead of the day after the due date.
- Import and export of YAML 1.1, including round-trip capability. - Import and export of YAML 1.1, including round-trip capability.
- New merge capability for syncing task data files. - New merge capability for syncing task data files.
- New push capability for distributing merged changes.
- When completing or modifying a task, the project status is displayed. - When completing or modifying a task, the project status is displayed.
- The 'info' report is now colorized. - The 'info' report is now colorized.
- Certain characters (#, $, @) are now supported for use in tags. - Certain characters (#, $, @) are now supported for use in tags.
@ -29,8 +30,9 @@ New commands in taskwarrior 1.9.3
and color rules from your .taskrc and theme. and color rules from your .taskrc and theme.
- New 'task export.yaml' command will export YAML 1.1, which can then be - New 'task export.yaml' command will export YAML 1.1, which can then be
imported via 'task import <file>'. imported via 'task import <file>'.
- New 'task merge <file>' command that can merge the local and an undo.data - New 'task merge <url>' command that can merge the local and an undo.data
file from another taskwarrior user, to sync across machines, for example. file from another taskwarrior user, to sync across machines, for example.
- New 'task push <url>' command to distribute merged changes.
New configuration options in taskwarrior 1.9.3 New configuration options in taskwarrior 1.9.3
@ -39,6 +41,7 @@ New configuration options in taskwarrior 1.9.3
- Color rule precedence can now be explicitly set with the configuration - Color rule precedence can now be explicitly set with the configuration
variable rule.precedence.color. Try "task show rule.pre" to show the variable rule.precedence.color. Try "task show rule.pre" to show the
default settings. default settings.
- merge.autopush to control whether pushing after merging is automated.
Newly deprecated features in taskwarrior 1.9.3 Newly deprecated features in taskwarrior 1.9.3

2
src/Transport.h
View file

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager. // taskwarrior - a command line task list manager.
// //
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. // Copyright 2010, Johannes Schlatow.
// All rights reserved. // All rights reserved.
// //
// This program is free software; you can redistribute it and/or modify it under // This program is free software; you can redistribute it and/or modify it under

2
src/TransportSSH.h
View file

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager. // taskwarrior - a command line task list manager.
// //
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. // Copyright 2010, Johannes Schlatow.
// All rights reserved. // All rights reserved.
// //
// This program is free software; you can redistribute it and/or modify it under // This program is free software; you can redistribute it and/or modify it under

6
src/report.cpp
View file

@ -204,9 +204,13 @@ int shortUsage (std::string &outs)
table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv"); table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv");
row = table.addRow (); row = table.addRow ();
table.addCell (row, 1, "task merge FILE"); table.addCell (row, 1, "task merge URL");
table.addCell (row, 2, "Merges the specified undo.data file with the local data files."); table.addCell (row, 2, "Merges the specified undo.data file with the local data files.");
row = table.addRow ();
table.addCell (row, 1, "task push URL");
table.addCell (row, 2, "Pushes the local undo.data files to the URL.");
row = table.addRow (); row = table.addRow ();
table.addCell (row, 1, "task export.ical"); table.addCell (row, 1, "task export.ical");
table.addCell (row, 2, "Lists all tasks in iCalendar format."); table.addCell (row, 2, "Lists all tasks in iCalendar format.");