Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge rev 1.16: implement -j for cvs diff, allowing tag:date based diffs | obrien | 2008-01-13 | 1 | -66/+100 |
| | | | | into version 1.11.22. | ||||
* | Fix merge typo. Add missing ",". | peter | 2004-04-15 | 1 | -1/+1 |
| | |||||
* | Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline | peter | 2004-04-15 | 1 | -185/+251 |
| | |||||
* | Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline | peter | 2003-01-21 | 1 | -1/+1 |
| | |||||
* | Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline | peter | 2002-12-02 | 1 | -2/+3 |
| | | | | Approved by: re | ||||
* | Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline | peter | 2002-09-02 | 1 | -37/+85 |
| | |||||
* | Implement -j for cvs diff, allowing tag:date based diffs (normally date-based | dillon | 2001-09-15 | 1 | -25/+56 |
| | | | | | | diffs are against the head branch only). MFC after: 1 week | ||||
* | Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is | peter | 2001-08-10 | 1 | -59/+57 |
| | | | | still some suspicious and/or broken stuff to fix yet. | ||||
* | Merge cyclic changes for 1.10.7 only our mainline. | peter | 1999-12-11 | 1 | -6/+26 |
| | |||||
* | Fixed style bugs in FreeBSD changes. KNF style doesn't apply to gnu | bde | 1999-07-04 | 1 | -4/+4 |
| | | | | sources. | ||||
* | Don't assume branch heads are alive.. (related to previous change to the | peter | 1999-05-10 | 1 | -1/+2 |
| | | | | older 1.9.26 baseline) | ||||
* | Merge cvs-1.9.xx -> 1.10 changes onto mainline. | peter | 1999-03-18 | 1 | -6/+17 |
| | | | | | | The merge turned up a long-standing bug in local additions. I'm not quite sure it's right yet. (the code in question is dealing with diffs relative to "HEAD" and dead revisions). | ||||
* | Merge changes from vendor branch into mainline | peter | 1998-03-10 | 1 | -11/+8 |
| | |||||
* | Merge changes from CYCLIC branch onto mainline. rcs.[ch] still to come. | peter | 1998-01-26 | 1 | -41/+103 |
| | |||||
* | Back out my -L change, now "patch -I" usage supposed to get Index: | ache | 1998-01-21 | 1 | -13/+7 |
| | | | | precedence | ||||
* | Fix wrong ---/*** names produced using -L diff option | ache | 1998-01-16 | 1 | -7/+13 |
| | | | | CVS gurus from info-cvs agrees that previous Index: usage is bogus | ||||
* | Merge conflicts from 970523 import | peter | 1997-05-23 | 1 | -1/+1 |
| | |||||
* | Attempt to work around the problem Bruce reported with 'cvs diff -rHEAD' | peter | 1997-05-21 | 1 | -2/+4 |
| | | | | | complaining about long-deleted files having been deleted and that there is no diff available. | ||||
* | Merge import conflicts | peter | 1997-05-15 | 1 | -169/+453 |
| | |||||
* | Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix. | asami | 1996-12-19 | 1 | -2/+2 |
| | |||||
* | Fix the "moving head" problem. | asami | 1996-12-12 | 1 | -2/+2 |
| | |||||
* | Import of slightly trimmed cvs-1.8 distribution. Generated files | peter | 1996-08-20 | 1 | -0/+623 |
and non-unix code has been left out. |