From: linux@horizon.com
To: junkio@cox.net, linux@horizon.com
Cc: git@vger.kernel.org
Subject: Re: Feature request: git-pull -e/--edit
Date: 19 Nov 2006 21:43:08 -0500 [thread overview]
Message-ID: <20061120024308.18620.qmail@science.horizon.com> (raw)
In-Reply-To: <7vy7q67tf2.fsf@assigned-by-dhcp.cox.net>
> How often is this desired, when the merge is clean?
Well, if I could quote your own words:
>> I use "git pull . topicA topicB" for a tetrapus, so that is not
>> a reason for me, but when a topicA's older parts are worthy to
>> be in 'next' while later parts are not yet, I often do (on 'next'):
>>
>> git merge "Merge early part of branch 'topicA'" HEAD topicA~3
I can't speak from personal experience, but a merge can bring in a lot
of changes, and sometimes the auto-generated message doesn't say quite
as much as you'd like.
The commits on the branch speak for themselves, of course, but sometimes
it's nice to add the same sort of overview that appears in a [PATCH 0/13]
e-mail. We wouldn't have that convention if there wasn't a frequent
desire for it.
(Indeed, it might be nice to come up with a way of including a piece of
the "please pull" e-mail, similar to the way that git-applypatch works.)
> If the answer is "not so often", you can already use "commit
> --amend" after "pull" creates an automated merge commit.
It's not done very often right now, but how much of that is due to
the awkwardness? I agree it works perfectly, but "commit --amend"
has very much the feel of a workaround.
I'm not going to besiege Troy for a decade over the idea, but it seemed
next prev parent reply other threads:[~2006-11-20 2:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-19 21:26 Feature request: git-pull -e/--edit linux
2006-11-20 2:17 ` Junio C Hamano
2006-11-20 2:43 ` linux [this message]
2006-11-20 3:21 ` Junio C Hamano
2006-11-20 8:02 ` Jakub Narebski
2006-11-20 10:17 ` [PATCH] git-merge: make it usable as the first class UI Junio C Hamano
2006-11-20 17:00 ` Horst H. von Brand
2006-11-20 19:52 ` Junio C Hamano
2006-11-20 13:42 ` Feature request: git-pull -e/--edit Eran Tromer
2006-11-20 17:09 ` Horst H. von Brand
2006-11-20 18:11 ` Petr Baudis
2006-11-20 19:10 ` Eran Tromer
2006-11-21 9:19 ` Johannes Schindelin
2006-11-22 23:02 ` 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=20061120024308.18620.qmail@science.horizon.com \
--to=linux@horizon.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).