From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Paolo Bonzini <bonzini@gnu.org>,
Stephen Boyd <bebarino@gmail.com>
Subject: [PATCH 0/9] add --ff option to cherry-pick
Date: Sat, 06 Feb 2010 00:11:02 +0100 [thread overview]
Message-ID: <20100205231028.3689.12228.chriscool@tuxfamily.org> (raw)
Changes since the previous series are the following:
- added some tests in a new patch
- added some documentation in a new patch
- added a patch to use the new "reset" function in builtin-merge.c
- made --ff incompatible with --edit -x and --signoff too, thanks to Paolo
- improved the first patch with suggestions from Stephen Boyd, thanks
- made a "struct lock_file" static to initialize it in the first patch
- improved commit messages
Christian Couder (8):
reset: refactor updating heads into a static function
reset: refactor reseting in its own function
reset: make reset function non static and declare it in "reset.h"
revert: add --ff option to allow fast forward when cherry-picking
cherry-pick: add tests for new --ff option
Documentation: describe new cherry-pick --ff option
rebase -i: use new --ff cherry-pick option
merge: use new "reset" function instead of running "git read-tree"
Stephan Beyer (1):
revert: libify cherry-pick and revert functionnality
Documentation/git-cherry-pick.txt | 6 +-
Makefile | 2 +
builtin-merge.c | 31 ++---
builtin-reset.c | 175 ++++++++++++----------
builtin-revert.c | 303 +++++++++----------------------------
git-rebase--interactive.sh | 15 +--
pick.c | 218 ++++++++++++++++++++++++++
pick.h | 13 ++
reset.h | 10 ++
t/t3506-cherry-pick-ff.sh | 38 +++++
10 files changed, 471 insertions(+), 340 deletions(-)
create mode 100644 pick.c
create mode 100644 pick.h
create mode 100644 reset.h
create mode 100755 t/t3506-cherry-pick-ff.sh
next reply other threads:[~2010-02-05 23:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 23:11 Christian Couder [this message]
2010-02-05 23:11 ` [PATCH 1/9] revert: libify cherry-pick and revert functionnality Christian Couder
2010-02-05 23:11 ` [PATCH 2/9] reset: refactor updating heads into a static function Christian Couder
2010-02-05 23:11 ` [PATCH 3/9] reset: refactor reseting in its own function Christian Couder
2010-02-05 23:11 ` [PATCH 4/9] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-02-05 23:11 ` [PATCH 5/9] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-02-05 23:57 ` Junio C Hamano
2010-02-06 0:21 ` Junio C Hamano
2010-02-28 22:22 ` Christian Couder
2010-02-06 9:40 ` Paolo Bonzini
2010-02-06 15:29 ` Christian Couder
2010-02-06 15:41 ` Paolo Bonzini
2010-02-05 23:11 ` [PATCH 6/9] cherry-pick: add tests for new --ff option Christian Couder
2010-02-05 23:11 ` [PATCH 7/9] Documentation: describe new cherry-pick " Christian Couder
2010-02-05 23:11 ` [PATCH 8/9] rebase -i: use new --ff cherry-pick option Christian Couder
2010-02-05 23:11 ` [PATCH 9/9] merge: use new "reset" function instead of running "git read-tree" Christian Couder
2010-02-06 0:03 ` Junio C Hamano
2010-02-06 15:34 ` Christian Couder
2010-02-05 23:45 ` [PATCH 0/9] add --ff option to cherry-pick Junio C Hamano
2010-02-06 15:27 ` 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=20100205231028.3689.12228.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.org \
/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).