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>
Subject: [RFC/PATCH 0/6] add --ff option to cherry-pick
Date: Mon, 01 Feb 2010 08:55:35 +0100 [thread overview]
Message-ID: <20100201074835.3929.11509.chriscool@tuxfamily.org> (raw)
The goal of this series is to add a --ff fast forward otion to cherry-pick
and use it in "rebase -i".
There is no documentation yet and the commit messages are too short but
this will be improved if the series looks worthwhile.
The first patch in this series is a refactoring patch that is not really
needed, but as it looks like a good refactoring/cleanup anyway I left it in.
Christian Couder (5):
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
rebase -i: use new --ff cherry-pick option
Stephan Beyer (1):
revert: libify cherry-pick and revert functionnality
Makefile | 2 +
builtin-reset.c | 175 +++++++++++++++------------
builtin-revert.c | 293 ++++++++++----------------------------------
git-rebase--interactive.sh | 15 +--
pick.c | 218 ++++++++++++++++++++++++++++++++
pick.h | 13 ++
reset.h | 10 ++
7 files changed, 407 insertions(+), 319 deletions(-)
create mode 100644 pick.c
create mode 100644 pick.h
create mode 100644 reset.h
next reply other threads:[~2010-02-01 7:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 7:55 Christian Couder [this message]
2010-02-01 7:55 ` [RFC/PATCH 1/6] revert: libify cherry-pick and revert functionnality Christian Couder
2010-02-01 10:26 ` Johannes Schindelin
2010-02-03 16:40 ` Stephen Boyd
2010-02-01 7:55 ` [RFC/PATCH 2/6] reset: refactor updating heads into a static function Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 3/6] reset: refactor reseting in its own function Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 4/6] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 5/6] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-02-01 11:10 ` Paolo Bonzini
2010-02-01 12:43 ` Christian Couder
2010-02-01 14:29 ` Paolo Bonzini
2010-02-02 5:13 ` Christian Couder
2010-02-02 7:56 ` Paolo Bonzini
2010-02-01 7:55 ` [RFC/PATCH 6/6] rebase -i: use new --ff cherry-pick option 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=20100201074835.3929.11509.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.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).