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

Merge branch '1.9.3' of tasktools.org:task into 1.9.3

Browse source
This commit is contained in:
Paul Beckingham 2010-10-03 18:49:52 -04:00
commit dea7b72b70
19 changed files with 364 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Config.cpp
View file

@ -80,7 +80,6 @@ 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"
@ -232,6 +231,11 @@ std::string Config::defaults =
"fontunderline=yes # Uses underlines rather than -------\n"
"shell.prompt=task> # Prompt used by the shell command\n"
"\n"
"# Merge options\n"
"merge.autopush=ask # Push database to remote origin after merge: yes, no, ask\n"
"#merge.default.uri=user@host.xz:.task/\n"
"#pull.default.uri=rsync://host.xz/task-backup/\n"
"\n"
"# Import heuristics - alternate names for fields (comma-separated list of names)\n"
"#import.synonym.bg=?\n"
"#import.synonym.description=?\n"