From: Kacper Kornet <draenog@pld-linux.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Aaron Schrab <aaron@schrab.com>
Subject: [PATCH v2 0/3] Add option to change order of parents in merge commit
Date: Wed, 28 Nov 2012 00:00:14 +0100 [thread overview]
Message-ID: <1354057217-65886-1-git-send-email-draenog@pld-linux.org> (raw)
The second version of patches introducing option to change order
of parents in merge commits. The changes in respect to the previous
version:
- I have divided the changes to the preparatory ones, which
only refactore the code without introducing new functionality, and
the commit which introduces the new option
- The documentation for the new options has been added
This is not yet a final version, as the tests are missing. But maybe while I'm working
on them there will be some comments.
Kacper Kornet (3):
Process MERGE_MODE before MERGE_HEAD
Allow for MERGE_MODE to specify more then one mode
Add option to transpose parents of merge commit
Documentation/merge-options.txt | 7 +++++++
builtin/commit.c | 22 ++++++++++++++--------
builtin/merge.c | 16 ++++++++++++----
commit.c | 11 +++++++++++
commit.h | 2 ++
git-pull.sh | 4 +++-
6 files changed, 49 insertions(+), 13 deletions(-)
--
1.8.0.1
next reply other threads:[~2012-11-27 23:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 23:00 Kacper Kornet [this message]
2012-11-27 23:00 ` [PATCH v2 1/3] Process MERGE_MODE before MERGE_HEAD Kacper Kornet
2012-11-27 23:00 ` [PATCH v2 2/3] Allow for MERGE_MODE to specify more then one mode Kacper Kornet
2012-11-28 2:17 ` Junio C Hamano
2012-11-28 4:36 ` Kacper Kornet
2012-11-28 7:30 ` Junio C Hamano
2012-11-27 23:00 ` [PATCH v2 3/3] Add option to transpose parents of merge commit Kacper Kornet
2012-11-28 2:18 ` Junio C Hamano
2012-11-28 4:43 ` Kacper Kornet
2012-11-28 6:56 ` Johannes Sixt
2012-11-28 16:52 ` Junio C Hamano
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=1354057217-65886-1-git-send-email-draenog@pld-linux.org \
--to=draenog@pld-linux.org \
--cc=aaron@schrab.com \
--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).