git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Nicolas Vigier <boklm@mars-attacks.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v4 0/9] add --gpg-sign to rebase and pull
Date: Mon, 10 Feb 2014 01:03:29 +0000	[thread overview]
Message-ID: <1391994218-639101-1-git-send-email-sandals@crustytoothpaste.net> (raw)

This series was posted to the list some time back.  This is a re-send of
Nicolas Vigier's work with an additional patch that adds --gpg-sign to
pull as well, as well as the fixes that Junio suggested in review for
v3.

There is also one additional merge call that was not previously given a
signature option that is now provided one.  I believe this was an
oversight, so I fixed it.

The major change in this version is fixed quoting for the arguments.
All the quoting should now be correct.  I reverted the change that
placed quoting around only the argument to -S, as this was too difficult
to get consistently right and nobody objected to '-S1F52F68B!' as being
too ugly to display to the user.

Nicolas Vigier (8):
  cherry-pick, revert: add the --gpg-sign option
  git-sh-setup.sh: add variable to use the stuck-long mode
  am: parse options in stuck-long mode
  am: add the --gpg-sign option
  rebase: remove useless arguments check
  rebase: don't try to match -M option
  rebase: parse options in stuck-long mode
  rebase: add the --gpg-sign option

brian m. carlson (1):
  pull: add the --gpg-sign option.

 Documentation/git-am.txt          |  6 +++-
 Documentation/git-cherry-pick.txt |  7 ++++-
 Documentation/git-rebase.txt      |  4 +++
 Documentation/git-revert.txt      |  6 +++-
 builtin/revert.c                  |  2 ++
 contrib/git-resurrect.sh          |  1 +
 git-am.sh                         | 26 ++++++++++------
 git-instaweb.sh                   |  1 +
 git-pull.sh                       | 13 +++++++-
 git-quiltimport.sh                |  1 +
 git-rebase--am.sh                 |  8 +++--
 git-rebase--interactive.sh        | 39 ++++++++++++++++--------
 git-rebase--merge.sh              |  2 +-
 git-rebase.sh                     | 62 +++++++++++++++++++++------------------
 git-request-pull.sh               |  1 +
 git-sh-setup.sh                   |  2 ++
 sequencer.c                       | 11 +++++++
 sequencer.h                       |  2 ++
 18 files changed, 135 insertions(+), 59 deletions(-)

-- 
1.9.0.rc3.1008.gd08b47c.dirty

             reply	other threads:[~2014-02-10  1:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-10  1:03 brian m. carlson [this message]
2014-02-10  1:03 ` [PATCH v4 1/9] cherry-pick, revert: add the --gpg-sign option brian m. carlson
2014-02-10  1:03 ` [PATCH v4 2/9] git-sh-setup.sh: add variable to use the stuck-long mode brian m. carlson
2014-02-10  1:03 ` [PATCH v4 3/9] am: parse options in " brian m. carlson
2014-02-10  1:03 ` [PATCH v4 4/9] am: add the --gpg-sign option brian m. carlson
2014-02-10  1:03 ` [PATCH v4 5/9] rebase: remove useless arguments check brian m. carlson
2014-02-10  1:03 ` [PATCH v4 6/9] rebase: don't try to match -M option brian m. carlson
2014-02-10  1:03 ` [PATCH v4 7/9] rebase: parse options in stuck-long mode brian m. carlson
2014-02-10  6:59   ` Eric Sunshine
2014-02-11  0:32     ` brian m. carlson
2014-02-10  1:03 ` [PATCH v4 8/9] rebase: add the --gpg-sign option brian m. carlson
2014-02-10  1:03 ` [PATCH v4 9/9] pull: " brian m. carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1391994218-639101-1-git-send-email-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=boklm@mars-attacks.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).