From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH 0/7] correctly calculate patches to rebase
Date: Wed, 18 Jul 2012 00:27:28 -0700 [thread overview]
Message-ID: <1342596455-17046-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)
These seven patches replace the broken one I sent in
http://thread.gmane.org/gmane.comp.version-control.git/200644/focus=200648. I
hope I got the handling of empty commits right this time.
Martin von Zweigbergk (7):
git-rebase--am.sh: avoid special-casing --keep-empty
git-rebase--interactive.sh: extract function for adding "pick" line
git-rebase--interactive: group all $preserve_merges code
git-rebase--interactive.sh: look up subject in add_pick_line
rebase -p: use --cherry-mark for todo file
rebase -p: don't request --left-right only to ignore left side
rebase (without -p): correctly calculate patches to rebase
git-am.sh | 10 +++++-
git-rebase--am.sh | 20 +++--------
git-rebase--interactive.sh | 87 ++++++++++++++++++++--------------------------
git-rebase--merge.sh | 2 +-
git-rebase.sh | 11 +++---
t/t3401-rebase-partial.sh | 17 +++++++++
t/t3406-rebase-message.sh | 14 ++++----
7 files changed, 81 insertions(+), 80 deletions(-)
--
1.7.11.1.104.ge7b44f1
next reply other threads:[~2012-07-18 7:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-18 7:27 Martin von Zweigbergk [this message]
2012-07-18 7:27 ` [PATCH 1/7] git-rebase--am.sh: avoid special-casing --keep-empty Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 2/7] git-rebase--interactive.sh: extract function for adding "pick" line Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 3/7] git-rebase--interactive: group all $preserve_merges code Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 5/7] rebase -p: use --cherry-mark for todo file Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 6/7] rebase -p: don't request --left-right only to ignore left side Martin von Zweigbergk
2012-07-18 7:27 ` [PATCH 7/7] rebase (without -p): correctly calculate patches to rebase Martin von Zweigbergk
2012-07-20 8:18 ` Johannes Sixt
2012-07-20 15:58 ` Martin von Zweigbergk
2012-07-20 8:14 ` [PATCH 4/7] git-rebase--interactive.sh: look up subject in add_pick_line Johannes Sixt
2012-07-20 15:47 ` Martin von Zweigbergk
2012-07-22 20:51 ` Junio C Hamano
2012-07-18 12:48 ` [PATCH 2/7] git-rebase--interactive.sh: extract function for adding "pick" line Neil Horman
2012-07-18 7:32 ` [PATCH 0/7] correctly calculate patches to rebase Martin von Zweigbergk
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=1342596455-17046-1-git-send-email-martin.von.zweigbergk@gmail.com \
--to=martin.von.zweigbergk@gmail.com \
--cc=git@vger.kernel.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).