From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 24 Mar 2009 04:52:37 +0000 (-0700)
Subject: Merge branch 'master' of git://github.com/psykoyiko/bti
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/03c3babc14f229472896d7ba863ff100f7ea329d

Merge branch 'master' of git://github.com/psykoyiko/bti
---

03c3babc14f229472896d7ba863ff100f7ea329d
diff --cc bti.c
index 71a2d81,68e1539..d0b8054
--- a/bti.c
+++ b/bti.c
@@@ -73,8 -69,7 +73,9 @@@ struct session 
  	char *logfile;
  	char *user;
  	int bash;
 +	int shrink_urls;
 +	int dry_run;
+ 	int page;
  	enum host host;
  	enum action action;
  };
@@@ -917,10 -633,9 +916,11 @@@ int main(int argc, char *argv[], char *
  		{ "action", 1, NULL, 'A' },
  		{ "user", 1, NULL, 'u' },
  		{ "logfile", 1, NULL, 'L' },
 +		{ "shrink-urls", 0, NULL, 's' },
  		{ "help", 0, NULL, 'h' },
  		{ "bash", 0, NULL, 'b' },
 +		{ "dry-run", 0, NULL, 'n' },
+ 		{ "page", 1, NULL, 'g' },
  		{ "version", 0, NULL, 'v' },
  		{ }
  	};