diff options
| author | Frédéric Heitzmann <frederic.heitzmann@gmail.com> | 2011-09-16 23:02:01 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2011-10-16 08:12:26 +0000 |
| commit | afd7f1eb0f4ceebcea2427e6e7f80d4dc32081ec (patch) | |
| tree | c63927c6bc491ba33b0f8d4a23b243ae9fd935ad /Documentation/git-svn.txt | |
| parent | 288396994f077eec7e7db0017838a5afbfbf81e3 (diff) | |
| download | git-afd7f1eb0f4ceebcea2427e6e7f80d4dc32081ec.tar.gz | |
git svn dcommit: new option --interactive.
Allow the user to check the patch set before it is commited to SVN. It is
then possible to accept/discard one patch, accept all, or quit.
This interactive mode is similar with 'git send email' behaviour. However,
'git svn dcommit' returns as soon as one patch is discarded.
Part of the code was taken from git-send-email.perl (see 'ask' function)
Tests several combinations of potential answers to
'git svn dcommit --interactive'. For each of them, test whether patches
were commited to SVN or not.
Thanks-to Eric Wong <normalperson@yhbt.net> for the initial idea.
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com>
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index f977e8780b..34ee785064 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -234,6 +234,14 @@ svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN. +--interactive;; + Ask the user to confirm that a patch set should actually be sent to SVN. + For each patch, one may answer "yes" (accept this patch), "no" (discard this + patch), "all" (accept all patches), or "quit". + + + 'git svn dcommit' returns immediately if answer if "no" or "quit", without + commiting anything to SVN. + 'branch':: Create a branch in the SVN repository. |