From: Petr Baudis <pasky@ucw.cz>
To: git@vger.kernel.org
Subject: [ANNOUNCE] Cogito-0.11.3
Date: Thu, 9 Jun 2005 11:19:09 +0200 [thread overview]
Message-ID: <20050609091909.GF29665@pasky.ji.cz> (raw)
Hello,
it turned out that Cogito was so broken w.r.t. three-way merging that
I had to really release a bugfix version. So this version contains some
cleanups of the merge script, some more portability fixes (it actually
runs on Debian old stable now!), and especially few bugfixes - cg-log
works with individual files passed to it now, and merging should
hopefully work correctly now too.
You know what to do. :-)
Junio C Hamano:
Add read-tree -m 3-way merge tests.
Linus Torvalds:
One more time.. Clean up git-merge-one-file-script
Fix up git-merge-one-file-script
Merge my and Petr's git-merge-one-file-script modifications
Make sure we error out if we can't remove a file on automatic merges.
Petr Baudis:
cogito-0.11.3
Fix cg-merge's three-way content merge
Support for compilation w/o OpenSSL
Portable stub for the stat call
Fix cg-diff -p to work with no -r specified
git-merge-one-file-script cleanups from Cogito
Further converge git-merge-one-file-script and cg-Xmergefile
Remove useless ret=0 in the onefile merge scripts
Make git-merge-one-file-script and cg-Xmergefile converge even more
Fix cg-log called on specified files
Tidy up some rev-list-related stuff
Fix git-merge-one-file permissions auto-merging
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..
next prev reply other threads:[~2005-06-09 9:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-09 21:40 [COGITO PATCH] value too great for base (error token is "-0800") Pavel Roskin
2005-06-09 11:19 ` [PATCH 3/6] Make showdate use "Linus format" Dan Holmsand
2005-06-09 9:19 ` Petr Baudis [this message]
2005-06-09 10:10 ` [ANNOUNCE] Cogito-0.11.3 Konstantin Antselovich
2005-06-09 13:07 ` Dan Holmsand
2005-06-09 20:55 ` Chris Wright
2005-06-09 21:06 ` Chris Wright
2005-06-09 3:40 ` [PATCH] Fix cogito handling of timezones Frank Sorenson
2005-06-09 8:29 ` Petr Baudis
2005-06-09 14:20 ` Frank Sorenson
2005-06-10 22:19 ` Petr Baudis
2005-06-10 22:59 ` [PATCH 3/6] Make showdate use "Linus format" Petr Baudis
2005-06-11 8:28 ` Dan Holmsand
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=20050609091909.GF29665@pasky.ji.cz \
--to=pasky@ucw.cz \
--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).