git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: linux@horizon.com
To: git@vger.kernel.org
Cc: linux@horizon.com
Subject: Feature request: git-pull -e/--edit
Date: 19 Nov 2006 16:26:11 -0500	[thread overview]
Message-ID: <20061119212611.13038.qmail@science.horizon.com> (raw)

The last end-user use I can think of for git-merge instead
of git-pull is providing a custom commit message.

Would it be possible to add -m and -e options to git-pull?

The problem I can see is that the latter would have to be added to
git-merge, and the guts there are a bit intricate; it uses git-commit-tree
directly rather than git-commit, so I can't just pass through the
arguments.

Assuming it's just as much of a pain for someone else, would it
still be worth the effort?  Can git-merge be cleaned up?

The manual option is to use "git merge --no-commit" and then supply the
arguments to git-commit in the usual way.

But I notice that --no-commit actually changes git's merging
technique.  If it's specified, the trivial in-index merge doesn't
appear to be attempted.  I don't think it makes a huge difference,

             reply	other threads:[~2006-11-19 21:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-19 21:26 linux [this message]
2006-11-20  2:17 ` Feature request: git-pull -e/--edit Junio C Hamano
2006-11-20  2:43   ` linux
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=20061119212611.13038.qmail@science.horizon.com \
    --to=linux@horizon.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).