Commits


rename got.conf(5) fetch-all-branches to fetch_all_branches for consistency Existing configuration files will keep working for now since the old name with dashes is still recognized by the config parser.


make it possible to show just one tag with 'got tag -l' suggested by jrick ok jrick jamsek


got patch: use status G for merged files (and document it) Suggested by stsp@. This makes possible to tell if 'got patch' used a merge-base from the repository for the 3-way merge or did a simple search/replace operation. While here update the tests to look for the 'G' status and the manpage, which was also missing the documentation for the 'C' status in got patch. ok stsp@


remove outdated and overly-specific documentation of got log -s output ok op@


got log: sync match_commit from tog So that 'got log -S' can match also the author and committer name, and the commit ID too. ok stsp@


reword description of how got log -p and -P interact with got log -S


make it possible to match committed patches with got log -p -S pattern ok op@


add a missing .Pp to got.1


add one-line output mode to got log with -s flag -s for short. Moves log search to -S. Patch by Evan Silberman


got patch: allow to reverse a patch add a flag to got_patch to reverse a patch before applying and the -R flag for `got patch'. ok stsp@


got patch: allow to strip path components Move some bits from the libexec helper to the main process so we know if the patch was generated by git or not and finally document the automatic stripping of a/ and b/ prefixes added by git-diff(1). ok stsp@


tweak wording to make it clearer where the mentioned -u option applies


mention that 'got patch' is compatible with 'cvs diff -u' output


mention that 'got patch' can read diffs produced by Git, to avoid any doubt


subordinate clauses preceding the main clause are offset by a comma