git-cvsexportcommit(1) [linux man page]

GIT-CVSEXPORTCOMMIT(1)						    Git Manual						    GIT-CVSEXPORTCOMMIT(1)

NAME

       git-cvsexportcommit - Export a single commit to a CVS checkout

SYNOPSIS

       git cvsexportcommit [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
	       [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

DESCRIPTION

       Exports a commit from Git to a CVS checkout, making it easier to merge patches from a Git repository into a CVS repository.

       Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must
       be defined. See examples below.

       It does its best to do the safe thing, it will check that the files are unchanged and up to date in the CVS checkout, and it will not
       autocommit by default.

       Supports file additions, removals, and commits that affect binary files.

       If the commit is a merge commit, you must tell git cvsexportcommit what parent the changeset should be done against.

OPTIONS

       -c
	   Commit automatically if the patch applied cleanly. It will not commit if any hunks fail to apply or there were other problems.

       -p
	   Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0

       -a
	   Add authorship information. Adds Author line, and Committer (if different from Author) to the message.

       -d
	   Set an alternative CVSROOT to use. This corresponds to the CVS -d parameter. Usually users will not want to set this, except if using
	   CVS in an asymmetric fashion.

       -f
	   Force the merge even if the files are not up to date.

       -P
	   Force the parent commit, even if it is not a direct parent.

       -m
	   Prepend the commit message with the provided prefix. Useful for patch series and the like.

       -u
	   Update affected files from CVS repository before attempting export.

       -k
	   Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) in working CVS checkout before applying patch.

       -w
	   Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the
	   current directory is within a Git repository. The default is the value of cvsexportcommit.cvsdir.

       -W
	   Tell cvsexportcommit that the current working directory is not only a Git checkout, but also the CVS checkout. Therefore, Git will
	   reset the working directory to the parent commit before proceeding.

       -v
	   Verbose.

CONFIGURATION

       cvsexportcommit.cvsdir
	   The default location of the CVS checkout to use for the export.

EXAMPLES

       Merge one patch into CVS

	       $ export GIT_DIR=~/project/.git
	       $ cd ~/project_cvs_checkout
	       $ git cvsexportcommit -v <commit-sha1>
	       $ cvs commit -F .msg <files>

       Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo

		       $ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>

       Merge pending patches into CVS automatically -- only if you really know what you are doing

	       $ export GIT_DIR=~/project/.git
	       $ cd ~/project_cvs_checkout
	       $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v

GIT

       Part of the git(1) suite

Git 1.8.5.3							    01/14/2014						    GIT-CVSEXPORTCOMMIT(1)

GIT-REVERT(1)							    Git Manual							     GIT-REVERT(1)

NAME

       git-revert - Revert some existing commits

SYNOPSIS

       git revert [--[no-]edit] [-n] [-m parent-number] [-s] <commit>...
       git revert --continue
       git revert --quit
       git revert --abort

DESCRIPTION

       Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them.
       This requires your working tree to be clean (no modifications from the HEAD commit).

       Note: git revert is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to
       throw away all uncommitted changes in your working directory, you should see git-reset(1), particularly the --hard option. If you want to
       extract specific files as they were in another commit, you should see git-checkout(1), specifically the git checkout <commit> -- <filename>
       syntax. Take care with these alternatives as both will discard uncommitted changes in your working directory.

OPTIONS

       <commit>...
	   Commits to revert. For a more complete list of ways to spell commit names, see gitrevisions(7). Sets of commits can also be given but
	   no traversal is done by default, see git-rev-list(1) and its --no-walk option.

       -e, --edit
	   With this option, git revert will let you edit the commit message prior to committing the revert. This is the default if you run the
	   command from a terminal.

       -m parent-number, --mainline parent-number
	   Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option
	   specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent.

	   Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will
	   only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what
	   you want.

	   See the revert-a-faulty-merge How-To[1] for more details.

       --no-edit
	   With this option, git revert will not start the commit message editor.

       -n, --no-commit
	   Usually the command automatically creates some commits with commit log messages stating which commits were reverted. This flag applies
	   the changes necessary to revert the named commits to your working tree and the index, but does not make the commits. In addition, when
	   this option is used, your index does not have to match the HEAD commit. The revert is done against the beginning state of your index.

	   This is useful when reverting more than one commits' effect to your index in a row.

       -s, --signoff
	   Add Signed-off-by line at the end of the commit message.

       --strategy=<strategy>
	   Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in git-merge(1) for details.

       -X<option>, --strategy-option=<option>
	   Pass the merge strategy-specific option through to the merge strategy. See git-merge(1) for details.

SEQUENCER SUBCOMMANDS

       --continue
	   Continue the operation in progress using the information in .git/sequencer. Can be used to continue after resolving conflicts in a
	   failed cherry-pick or revert.

       --quit
	   Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert.

       --abort
	   Cancel the operation and return to the pre-sequence state.

EXAMPLES

       git revert HEAD~3
	   Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes.

       git revert -n master~5..master~2
	   Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but
	   do not create any commit with the reverted changes. The revert only modifies the working tree and the index.

SEE ALSO

       git-cherry-pick(1)

GIT

       Part of the git(1) suite

NOTES

	1. revert-a-faulty-merge How-To
	   git-htmldocs/howto/revert-a-faulty-merge.html

Git 1.8.5.3							    01/14/2014							     GIT-REVERT(1)