Merge

- Added support for URIs - Added push command (pushes *.data to remote location) - Added config option: merge.autopush
2010-09-02 01:26:55 +02:00
parent d362088305
commit 869655e818
8 changed files with 85 additions and 5 deletions
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -80,6 +80,7 @@ std::string Config::defaults =
  "recurrence.indicator=R                        # What to show as a task recurrence indicator\n"
  "recurrence.limit=1                            # Number of future recurring pending tasks\n"
  "undo.style=side                               # Undo style - can be 'side', or 'diff'\n"
+	"merge.autopush=ask                            # Push database to remote origin after merge: yes, no, ask\n"
  "\n"
  "# Dates\n"
  "dateformat=m/d/Y                              # Preferred input and display date format\n"