summaryrefslogtreecommitdiff
path: root/usr.bin
AgeCommit message (Collapse)Author
2005-10-26diff3_conflicts cleanup; joris okXavier Santolaria
2005-10-263rd arg to F_GETFL fcntl doesn't need to be a pointer, 0 is fine.Todd C. Miller
2005-10-26clarify the description of the ci(1) command behaviour aboutXavier Santolaria
file description and log entries.
2005-10-26dupe name; miod@ confirmedMichael Shalayeff
2005-10-26correct -R behaviour;Xavier Santolaria
2005-10-26install ident and rlog too; joris okXavier Santolaria
2005-10-25minor knf;Xavier Santolaria
2005-10-25nuke trailing whitespaces;Xavier Santolaria
2005-10-25-T here too;Xavier Santolaria
2005-10-25-T is kept for compatibility with other RCS commands here too;Xavier Santolaria
2005-10-25missed that in previous commit;Xavier Santolaria
2005-10-25dont' -> don't in comments;Jason McIntyre
from ray lai;
2005-10-25put HISTORY section in the right place;Jason McIntyre
2005-10-25Make set_common_sockopts() a void since it doesn't return anything anyway.Darren Tucker
Makes netcat -Wall clean. ok djm@
2005-10-25Add a -T option to nc to allow setting of IP type-of-service bits onDarren Tucker
connections. Man page corrections jmc@, code corrections and ok djm@
2005-10-24output tweaks;Xavier Santolaria
2005-10-24first bits for RCS intro; input/ok jmc, "fine" joris.Xavier Santolaria
more to come ...
2005-10-24.Xr rcsmerge(1);Xavier Santolaria
2005-10-23add extern int diff3_conflicts to unbreak. bad joris.Niall O'Higgins
2005-10-23correct error message;Xavier Santolaria
2005-10-23warn if conflicts were found during the merge;Joris Vink
2005-10-23better output;Joris Vink
2005-10-23with recent diff3 support, rcsmerge now works;Joris Vink
2005-10-23shut up gcc;Joris Vink
2005-10-23- correctly terminate buffer in edscript(), noted by pedro@Joris Vink
- fix patching for large files;
2005-10-22fix warning when compiling usr.bin/rcsJoris Vink
2005-10-22need util.c for diff3Joris Vink
2005-10-22forgot this in previous commit;Joris Vink
2005-10-22diff3 support, needed for merging files together;Joris Vink
"go for it" niallo@
2005-10-22- don't check for admin files when running init;Joris Vink
- don't pass the Entry for newly added files to cvs_date_parse() - in rcs_rev_add don't bother looking for the previous rev if we are creating the RCS file. from PR 4575
2005-10-20spelling;Jason McIntyre
ok ian@
2005-10-20defintion -> definition;Jason McIntyre
2005-10-20+YFLAGS=Xavier Santolaria
2005-10-20fix output if -p is specified; joris okXavier Santolaria
2005-10-20fix up the licey entry; from form@Michael Shalayeff
2005-10-19Add -h option to display human-readable numbers.Marc Espie
okay otto@, deraadt@, jmc@. (note that is mostly useless from scripts, hence okay as a non-standard option).
2005-10-19sync usage();Xavier Santolaria
2005-10-19.Xr rcsmerge(1) + one style nitpick;Xavier Santolaria
2005-10-19- make a bunch of changes to how we handle verbose output. this brings usNiall O'Higgins
much closer in line with GNU RCS and cleans things up in general. ok joris@, "looks fine to me" xsa@
2005-10-19add co -p support;Joris Vink
input from xsa@ and niallo@;
2005-10-18Don't consider the last line of the compilation buffer asKjell Wooding
parsable output. It is always a status message. While here, some better error checking. looks ok, cloder@.
2005-10-18make fill-paragraph undoableKjell Wooding
2005-10-18more rcsmerge(1) bits;Xavier Santolaria
2005-10-18skeletons for rcsmerge(1);Xavier Santolaria
2005-10-18put -N description in the right place, and fix its description;Jason McIntyre
2005-10-18big sorry to simon dassow, whose diff i inadvertently removed;Jason McIntyre
this reinstates it;
2005-10-18- `-N' works now; document it.Niall O'Higgins
2005-10-18When attempting to open a filename, walk backwards through minibuffer:Kjell Wooding
a> if you run into the beginning of the string, use the whole thing b> if you run into a // combo, use everything starting from the second / c> if you run into a /~ combo, use everything starting from the ~ i.e. do like emacs. From (and for) Jason Wright
2005-10-18- no point in using cvs_printf() in openrcs;Joris Vink
- only output info messages if -q flag isn't given;
2005-10-18oops, rcs_set_rev() can't operate when str is NULL of course;Joris Vink