From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
To: Junio C Hamano <junkio@cox.net>
Cc: Linus Torvalds <torvalds@osdl.org>,
Kay Sievers <kay.sievers@vrfy.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: More gitweb queries..
Date: Fri, 27 May 2005 21:55:52 +0200 [thread overview]
Message-ID: <20050527195552.GA6541@cip.informatik.uni-erlangen.de> (raw)
In-Reply-To: <7vhdgoxx8c.fsf@assigned-by-dhcp.cox.net>
Hello,
> You merge by hand and resolve if they have conflicts, just like
> what you already do in two head merge case.
I see. Does that mean that 'git-ls-files --unmerged' will report upto 9
stages per file?
> Octopus is only about how you record the results. Instead of
> making 7 consecutive "merge from A" "merge from B" to record two
> head merges, you just say "I merged these 8 heads" in a single
> commit.
I got that part. :-)
Thomas
next prev parent reply other threads:[~2005-05-27 19:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-27 19:24 More gitweb queries Linus Torvalds
2005-05-27 19:29 ` Thomas Glanzmann
2005-05-27 19:52 ` Junio C Hamano
2005-05-27 19:55 ` Thomas Glanzmann [this message]
2005-05-27 20:13 ` Junio C Hamano
2005-05-27 20:32 ` Thomas Glanzmann
2005-05-27 20:40 ` Junio C Hamano
2005-05-27 22:00 ` Linus Torvalds
2005-05-27 22:04 ` Thomas Glanzmann
2005-05-28 2:26 ` Junio C Hamano
2005-05-29 23:02 ` Thomas Glanzmann
2005-05-29 23:10 ` Thomas Glanzmann
2005-05-29 23:16 ` Thomas Glanzmann
2005-05-29 23:46 ` Thomas Glanzmann
2005-05-29 23:56 ` Thomas Glanzmann
2005-05-30 0:50 ` Junio C Hamano
2005-05-30 0:57 ` Junio C Hamano
2005-05-30 1:33 ` Thomas Glanzmann
2005-05-30 1:30 ` Thomas Glanzmann
2005-05-30 7:57 ` Junio C Hamano
2005-05-30 8:36 ` Thomas Glanzmann
2005-05-30 9:21 ` Thomas Glanzmann
2005-05-30 10:20 ` Junio C Hamano
2005-05-30 12:11 ` Thomas Glanzmann
2005-05-30 17:54 ` Junio C Hamano
2005-05-27 20:17 ` Linus Torvalds
2005-05-27 19:54 ` Junio C Hamano
2005-05-27 19:58 ` Thomas Glanzmann
2005-05-27 20:03 ` Linus Torvalds
2005-05-27 20:24 ` Junio C Hamano
2005-05-27 19:31 ` Thomas Glanzmann
2005-05-27 19:32 ` Junio C Hamano
2005-05-27 19:48 ` Linus Torvalds
2005-05-27 23:12 ` Benjamin Herrenschmidt
2005-05-27 23:59 ` Kay Sievers
2005-05-28 1:03 ` Daniel Serpell
2005-05-28 2:51 ` David Lang
2005-05-28 10:56 ` Kay Sievers
2005-05-28 8:42 ` Kay Sievers
2005-05-28 22:43 ` Benjamin Herrenschmidt
2005-05-30 23:03 ` Paul Mackerras
2005-05-31 2:27 ` Jeff Epler
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=20050527195552.GA6541@cip.informatik.uni-erlangen.de \
--to=sithglan@stud.uni-erlangen.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=kay.sievers@vrfy.org \
--cc=torvalds@osdl.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).