From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Sverre Rabbelier <srabbelier@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 0/8] implement cherry-picking many commits
Date: Mon, 31 May 2010 21:42:31 +0200 [thread overview]
Message-ID: <20100531193359.28729.55562.chriscool@tuxfamily.org> (raw)
This a patch series to implement cherry-picking and reverting
many commits instead of just one.
There is still no way to continue or abort the process when
cherry-picking or reverting fails, but this can be implemented
later.
Changes since the previous RFC series are the following:
- now use the equivalent of 'git rev-list --no-walk "$@"' to
enumerate the commits (suggested by Junio)
- added a patch to cleanup the code related to the -x option
(suggested by Ram)
- added a commit to change help_msg() and its callers
- added 2 documentation patches
Christian Couder (8):
revert: cleanup code for -x option
revert: use run_command_v_opt() instead of execv_git_cmd()
revert: refactor code into a do_pick_commit() function
revert: change help_msg() to take no argument
revert: allow cherry-picking more than one commit
revert: add tests to check cherry-picking many commits
Documentation/cherry-pick: describe passing more than one commit
Documentation/revert: describe passing more than one commit
Documentation/git-cherry-pick.txt | 64 ++++++++++++++++-----
Documentation/git-revert.txt | 52 +++++++++++------
builtin/revert.c | 109 ++++++++++++++++++++++-------------
t/t3508-cherry-pick-many-commits.sh | 95 ++++++++++++++++++++++++++++++
4 files changed, 249 insertions(+), 71 deletions(-)
create mode 100755 t/t3508-cherry-pick-many-commits.sh
next reply other threads:[~2010-06-01 3:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-31 19:42 Christian Couder [this message]
2010-05-31 19:42 ` [PATCH 1/8] revert: cleanup code for -x option Christian Couder
2010-05-31 19:42 ` [PATCH 2/8] revert: use run_command_v_opt() instead of execv_git_cmd() Christian Couder
2010-06-01 4:01 ` Jonathan Nieder
2010-06-01 4:33 ` Christian Couder
2010-05-31 19:42 ` [PATCH 3/8] revert: refactor code into a do_pick_commit() function Christian Couder
2010-05-31 19:42 ` [PATCH 4/8] revert: change help_msg() to take no argument Christian Couder
2010-06-01 5:08 ` Jonathan Nieder
2010-06-01 5:40 ` Jeff King
2010-06-01 6:27 ` Jonathan Nieder
2010-05-31 19:42 ` [PATCH 5/8] revert: allow cherry-picking more than one commit Christian Couder
2010-06-01 7:38 ` Sverre Rabbelier
2010-06-01 8:35 ` Jonathan Nieder
2010-06-02 23:37 ` Junio C Hamano
2010-06-03 4:18 ` Christian Couder
2010-06-01 9:03 ` Jonathan Nieder
2010-06-02 5:57 ` Christian Couder
2010-05-31 19:42 ` [PATCH 6/8] revert: add tests to check cherry-picking many commits Christian Couder
2010-05-31 19:42 ` [PATCH 7/8] Documentation/cherry-pick: describe passing more than one commit Christian Couder
2010-06-01 9:29 ` Ramkumar Ramachandra
2010-06-02 5:57 ` Christian Couder
2010-06-01 9:51 ` Jonathan Nieder
2010-06-01 10:26 ` Ramkumar Ramachandra
2010-06-02 5:57 ` Christian Couder
2010-06-02 5:57 ` Christian Couder
2010-06-02 6:14 ` Jonathan Nieder
2010-06-14 3:33 ` Christian Couder
2010-05-31 19:42 ` [PATCH 8/8] Documentation/revert: " Christian Couder
2010-06-01 13:28 ` Antriksh Pany
2010-06-02 5:57 ` Christian Couder
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=20100531193359.28729.55562.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=srabbelier@gmail.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).