From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Eric Sunshine" <sunshine@sunshineco.com>,
tim@tim-landscheidt.de,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 0/3] Add "git rebase --show-patch"
Date: Wed, 31 Jan 2018 16:30:47 +0700 [thread overview]
Message-ID: <20180131093051.15525-1-pclouds@gmail.com> (raw)
In-Reply-To: <20180126095520.919-1-pclouds@gmail.com>
v2:
- keeps --show-patch, but it's renamed to be more specific and
hopefully less misleading. Other names I thought of were
--show-patch-in-progress, --show-stopped-patch or
--show-conflict-patch but they don't look as good.
Also, since this is a long option name, I don't think length
matters. You either go with tab completion, alias or short option
name when you want to type it fast.
- --show-patch now uses git show instead of format-patch, this
gives coloring for all rebase cases
- people who are not happy with --show-patch can roll their own with
the help from the pseudo ref ORIG_COMMIT
Nguyễn Thái Ngọc Duy (3):
am: add --show-current-patch
rebase: add --show-current-patch
rebase: introduce and use pseudo-ref ORIG_COMMIT
Documentation/git-am.txt | 6 +++-
Documentation/git-rebase.txt | 7 +++-
builtin/am.c | 46 +++++++++++++++++++++++---
contrib/completion/git-completion.bash | 8 ++---
git-rebase--am.sh | 3 ++
git-rebase--interactive.sh | 6 ++++
git-rebase--merge.sh | 5 +++
git-rebase.sh | 8 ++++-
sequencer.c | 3 ++
t/t3400-rebase.sh | 34 +++++++++++++++++++
t/t3404-rebase-interactive.sh | 8 +++++
t/t4150-am.sh | 5 +++
12 files changed, 128 insertions(+), 11 deletions(-)
--
2.16.1.205.g271f633410
next prev parent reply other threads:[~2018-01-31 9:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-26 9:55 [PATCH 0/2] Add "git rebase --show-patch" Nguyễn Thái Ngọc Duy
2018-01-26 9:55 ` [PATCH 1/2] am: add --show-patch Nguyễn Thái Ngọc Duy
2018-01-26 9:55 ` [PATCH 2/2] rebase: " Nguyễn Thái Ngọc Duy
2018-01-26 11:12 ` Phillip Wood
2018-01-26 11:22 ` Duy Nguyen
2018-01-30 11:15 ` Phillip Wood
2018-01-26 19:11 ` Eric Sunshine
2018-01-27 1:42 ` Duy Nguyen
2018-01-26 18:47 ` [PATCH 0/2] Add "git rebase --show-patch" Tim Landscheidt
2018-01-27 1:45 ` Duy Nguyen
2018-01-27 11:26 ` Ævar Arnfjörð Bjarmason
2018-01-29 15:09 ` Johannes Schindelin
2018-01-30 9:10 ` Duy Nguyen
2018-01-30 12:32 ` Johannes Schindelin
2018-01-30 20:19 ` Junio C Hamano
2018-02-01 2:06 ` Tim Landscheidt
2018-01-31 9:30 ` Nguyễn Thái Ngọc Duy [this message]
2018-01-31 9:30 ` [PATCH v2 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31 9:40 ` Eric Sunshine
2018-01-31 22:59 ` Junio C Hamano
2018-02-02 9:25 ` Duy Nguyen
2018-02-02 9:46 ` Eric Sunshine
2018-02-02 9:53 ` Duy Nguyen
2018-02-02 18:56 ` Junio C Hamano
2018-01-31 9:30 ` [PATCH] gitignore.txt: elaborate shell glob syntax Nguyễn Thái Ngọc Duy
2018-01-31 23:22 ` Junio C Hamano
2018-02-01 9:59 ` Duy Nguyen
2018-01-31 9:30 ` [PATCH v2 2/3] rebase: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31 9:30 ` [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT Nguyễn Thái Ngọc Duy
2018-01-31 23:18 ` Junio C Hamano
2018-02-01 10:02 ` Duy Nguyen
2018-02-02 19:00 ` Junio C Hamano
2018-02-01 11:05 ` Phillip Wood
2018-02-11 9:43 ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 2/3] rebase: " Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 3/3] rebase: introduce and use pseudo-ref REBASE_HEAD Nguyễn Thái Ngọc Duy
2018-02-22 0:21 ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Junio C Hamano
2018-02-22 0:54 ` Tim Landscheidt
2018-02-23 10:20 ` Duy Nguyen
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=20180131093051.15525-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
--cc=tim@tim-landscheidt.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.