Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | * huge merge to bring the apt debian-sid and ubuntu branches as close | Michael Vogt | 2007-06-09 | 8 | -5/+1307 | |
|\ | ||||||
| * | * updated from http://people.ubuntu.com/~mvo/bzr/apt/auto-mark/ | Michael Vogt | 2007-05-02 | 1 | -0/+4 | |
| |\ | ||||||
| | * | * cmdline/apt-get.cc: | Michael Vogt | 2007-03-14 | 1 | -0/+1 | |
| | * | * apt-pkg/depcache.cc: | Michael Vogt | 2007-03-14 | 1 | -0/+2 | |
| * | | * merged with the apt--mvo branch | Michael Vogt | 2007-05-02 | 1 | -3/+4 | |
| |\ \ | ||||||
| * \ \ | * merged apt--curl-https branch | Michael Vogt | 2006-12-19 | 1 | -0/+13 | |
| |\ \ \ | ||||||
| | * | | | * methods/https.cc: | Michael Vogt | 2006-12-19 | 1 | -0/+13 | |
| * | | | | * merged the apt-breaks-iwj branch | Michael Vogt | 2006-12-14 | 3 | -2/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | * merged with apt--mvo | Michael Vogt | 2006-12-14 | 10 | -18/+30 | |
| | |\| | | | ||||||
| | * | | | | initial Breaks implementation | Ian Jackson | 2006-08-25 | 3 | -2/+5 | |
| | * | | | | * merged the apt--install-recommends branch | Michael Vogt | 2006-08-10 | 1 | -0/+4 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | * merged with mainline | Michael Vogt | 2006-08-01 | 4 | -2/+4 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | * merged the debian--auto-mark patch | Michael Vogt | 2006-07-03 | 2 | -3/+8 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | * merged with apts mainline | Michael Vogt | 2006-07-03 | 5 | -9/+10 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | * merged from main | Michael Vogt | 2006-03-28 | 21 | -2643/+6345 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | * merged with mainline | Michael Vogt | 2006-02-13 | 3 | -32/+35 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | * merged with apt--mvo | Michael Vogt | 2006-01-10 | 4 | -19/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | * add more missing bits from debians apt | Michael Vogt | 2005-12-08 | 1 | -0/+46 | |
| | * | | | | | | | | | | | * added the apt-secure manpage | Michael Vogt | 2005-12-08 | 2 | -0/+426 | |
| | * | | | | | | | | | | | * more missing bits from the last merge | Michael Vogt | 2005-12-08 | 2 | -0/+97 | |
| | * | | | | | | | | | | | * merged with the current debian version | Michael Vogt | 2005-12-08 | 7 | -17/+99 | |
| | * | | | | | | | | | | | * merged with the current debian version | Michael Vogt | 2005-11-25 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | * merge with apt--mvo | Michael Vogt | 2005-11-14 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | * merged with apt--mvo | Michael Vogt | 2005-11-09 | 3 | -8/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | * merged the trust-cdrom branch | Michael Vogt | 2005-08-23 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | * merged with apt@packages.debian.org/apt--main--0 | Michael Vogt | 2005-08-05 | 1 | -0/+8 | |
| | * | | | | | | | | | | | | | | Merge with mvo | Matt Zimmerman | 2005-06-26 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | Merge from Debian branch | Matt Zimmerman | 2005-06-25 | 1 | -2/+44 | |
| * | | | | | | | | | | | | | | | * merged from the apt--auto-mark branch | Michael Vogt | 2006-12-14 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | * doc/apt-get.8.xml: | Michael Vogt | 2006-10-02 | 1 | -0/+13 | |
| | * | | | | | | | | | | | | | | * merged with the apt--mvo branch | Michael Vogt | 2006-09-06 | 4 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | / / / / | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | * merged with apt--debian-sid | Michael Vogt | 2006-12-14 | 9 | -10/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | * merged from main | Michael Vogt | 2006-12-01 | 5 | -5/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | * merged from Christians branch | Michael Vogt | 2006-10-11 | 3 | -3/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * merged from apt--mvo | Michael Vogt | 2006-10-09 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * merged with unstable, prepared upload | Michael Vogt | 2006-10-02 | 2 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | * merged from mainline | Michael Vogt | 2006-09-30 | 1 | -0/+1 | |
| | |\| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | * merged with mainline | Michael Vogt | 2006-09-12 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * merged with mainline | Michael Vogt | 2006-07-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | * merged with mainline | Michael Vogt | 2006-07-25 | 3 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * merged from mainline | Michael Vogt | 2006-06-09 | 2 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | * merged the install-recommends branch | Michael Vogt | 2006-08-15 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | * cmdline/apt-get.cc: | Michael Vogt | 2006-08-09 | 1 | -0/+4 | |
| | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | * merged with mainline | Michael Vogt | 2006-07-26 | 4 | -2/+4 | |
| |\| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | * merged the auto-remove branch | Michael Vogt | 2006-06-26 | 3 | -4/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | * merged with mainline | Michael Vogt | 2006-06-26 | 32 | -2703/+6422 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | * updated to apt--mvo | Michael Vogt | 2005-12-08 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | * merged with apt--mvo--0 | Michael Vogt | 2005-11-16 | 15 | -18/+681 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | * merged from main | Michael Vogt | 2005-08-18 | 1 | -0/+8 | |
| | * | | | | | | | | | | | | | | | | | | * added APT::NeverAutoRemove (a list of regexp for package names that should ... | Michael Vogt | 2005-06-30 | 1 | -1/+4 |