git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Feature request: git-pull -e/--edit

From
Llinux@horizon.com <linux@horizon.com>
Date
Nov 20, 2006, 02:43 UTC
Message-ID
<20061120024308.18620.qmail@science.horizon.com>
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:
Show 5 quoted lines
>> 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “Feature request: git-pull -e/--edit”
  1. linux@horizon.comNov 19, 2006
  2. Junio C HamanoNov 20, 2006
  3. linux@horizon.comNov 20, 2006
  4. Junio C HamanoNov 20, 2006
  5. Jakub NarebskiNov 20, 2006
  6. git-merge: make it usable as the first class UIJunio C Hamano, Nov 20, 2006
  7. Junio C HamanoNov 22, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.