diff --git a/NEWS b/NEWS index ac775f55f..9595f7ac0 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,7 @@ New Features in taskwarrior 1.9.3 instead of the day after the due date. - Import and export of YAML 1.1, including round-trip capability. - 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. - The 'info' report is now colorized. - 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. - New 'task export.yaml' command will export YAML 1.1, which can then be imported via 'task import '. - - New 'task merge ' command that can merge the local and an undo.data + - New 'task merge ' command that can merge the local and an undo.data file from another taskwarrior user, to sync across machines, for example. + - New 'task push ' command to distribute merged changes. 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 variable rule.precedence.color. Try "task show rule.pre" to show the default settings. + - merge.autopush to control whether pushing after merging is automated. Newly deprecated features in taskwarrior 1.9.3 diff --git a/src/Transport.h b/src/Transport.h index e03b5cd63..5bce558e5 100644 --- a/src/Transport.h +++ b/src/Transport.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // taskwarrior - a command line task list manager. // -// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. +// Copyright 2010, Johannes Schlatow. // All rights reserved. // // This program is free software; you can redistribute it and/or modify it under diff --git a/src/TransportSSH.h b/src/TransportSSH.h index c10afab62..046b8cb96 100644 --- a/src/TransportSSH.h +++ b/src/TransportSSH.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // taskwarrior - a command line task list manager. // -// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. +// Copyright 2010, Johannes Schlatow. // All rights reserved. // // This program is free software; you can redistribute it and/or modify it under diff --git a/src/report.cpp b/src/report.cpp index 5e7ea8e8b..0f539c001 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -204,9 +204,13 @@ int shortUsage (std::string &outs) table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv"); 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."); + 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 (); table.addCell (row, 1, "task export.ical"); table.addCell (row, 2, "Lists all tasks in iCalendar format.");