From: Martin Waitz <tali@admingilde.org>
To: git@vger.kernel.org
Subject: git refuses to switch to older branches
Date: Sat, 19 Aug 2006 22:25:58 +0200 [thread overview]
Message-ID: <20060819202558.GE30022@admingilde.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
hoi :)
now that gitweb.cgi is autogenerated, git refuses to switch to old
branches unless force is applied:
fatal: Untracked working tree file 'gitweb/gitweb.cgi' would
be overwritten by merge.
This safety measure is quite useful normally, but for files that are
explicitly marked as to-be-ignored it should not be neccessary.
But all the code that handles .gitignore is only used by ls-files now.
Does it make sense to add exclude handling to unpack-trees.c, too?
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2006-08-19 20:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-19 20:25 Martin Waitz [this message]
2006-08-19 21:47 ` git refuses to switch to older branches Jakub Narebski
2006-08-19 22:41 ` Junio C Hamano
2006-08-19 22:48 ` Jakub Narebski
2006-08-20 1:34 ` Junio C Hamano
2006-08-19 22:39 ` Junio C Hamano
2006-08-19 22:44 ` Petr Baudis
2006-08-20 12:21 ` Martin Waitz
2006-08-20 12:48 ` Johannes Schindelin
2006-08-20 18:15 ` Martin Waitz
2006-08-20 18:46 ` Johannes Schindelin
2006-08-20 19:11 ` Josef Weidendorfer
2006-08-20 7:26 ` Alex Riesen
2006-08-20 12:19 ` Martin Waitz
2006-09-08 22:00 ` Alex Riesen
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=20060819202558.GE30022@admingilde.org \
--to=tali@admingilde.org \
--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).