From: Jeff King <peff@peff.net>
To: Steffen Prohaska <prohaska@zib.de>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Matthew L Foster <mfoster167@yahoo.com>,
git@vger.kernel.org
Subject: Re: merge time
Date: Mon, 30 Jul 2007 04:14:40 -0400 [thread overview]
Message-ID: <20070730081439.GA907@coredump.intra.peff.net> (raw)
In-Reply-To: <577C7529-4C3C-40D4-B86A-8B3CE888C997@zib.de>
On Mon, Jul 30, 2007 at 10:09:16AM +0200, Steffen Prohaska wrote:
> I needed to slightly modify it
>
> git config --global alias.force-commit \
> '! git update-ref HEAD $(echo MARK | git commit-tree $(git cat-file
> commit HEAD | grep ^tree | cut -b 6-) -p HEAD)'
How about "git commit-tree HEAD^{tree} -p HEAD"?
But I think making a "fake" commit to force non-fast-forward is the
wrong thing. You really want to make your "extra" commit be the merge
that wouldn't have happened (which unfortunately is not as simple as
just creating a commit by hand, since you have to actually _do_ the
merge to get the tree).
-Peff
next prev parent reply other threads:[~2007-07-30 8:14 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-29 17:33 merge time Matthew L Foster
2007-07-29 23:19 ` Jakub Narebski
2007-07-29 23:35 ` Linus Torvalds
2007-07-30 1:11 ` Matthew L Foster
2007-07-30 1:27 ` david
2007-07-30 2:29 ` Linus Torvalds
2007-07-30 2:43 ` Matthew L Foster
2007-07-30 3:06 ` Linus Torvalds
2007-07-30 3:16 ` Linus Torvalds
2007-07-30 4:13 ` Matthew L Foster
2007-07-30 11:33 ` Sean
2007-07-30 3:57 ` Matthew L Foster
2007-07-30 6:10 ` Steffen Prohaska
2007-07-30 6:48 ` Junio C Hamano
2007-07-30 7:44 ` Steffen Prohaska
2007-07-30 7:49 ` Shawn O. Pearce
2007-07-30 8:09 ` Steffen Prohaska
2007-07-30 8:14 ` Jeff King [this message]
2007-07-30 8:24 ` Junio C Hamano
2007-07-30 8:31 ` Jeff King
2007-07-30 8:25 ` Steffen Prohaska
2007-07-30 8:32 ` Jeff King
2007-07-30 8:34 ` david
2007-07-30 8:41 ` Jeff King
2007-07-30 17:42 ` Linus Torvalds
2007-07-31 18:06 ` Steffen Prohaska
2007-07-31 20:07 ` david
2007-07-30 12:44 ` Rogan Dawes
2007-07-30 16:14 ` Matthew L Foster
2007-07-30 16:20 ` Johannes Schindelin
2007-07-30 16:24 ` Matthew L Foster
2007-07-30 16:25 ` Rogan Dawes
2007-07-30 17:06 ` Matthew L Foster
2007-07-30 17:13 ` david
2007-07-30 21:57 ` Jakub Narebski
-- strict thread matches above, loose matches on Subject: below --
2007-07-30 2:28 Matthew L Foster
2007-07-30 3:09 ` Linus Torvalds
2007-07-30 4:10 ` Matthew L Foster
2007-07-30 4:17 ` david
2007-07-30 16:20 ` Matthew L Foster
2007-07-30 16:23 ` david
2007-07-30 17:11 ` Matthew L Foster
2007-07-30 17:33 ` david
2007-07-30 22:11 ` Robin Rosenberg
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=20070730081439.GA907@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mfoster167@yahoo.com \
--cc=prohaska@zib.de \
--cc=spearce@spearce.org \
--cc=torvalds@linux-foundation.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).