From: "Sérgio Basto" <sergio@serjux.com>
To: git@vger.kernel.org
Subject: GIT: ignoring changes in tracked files and bug report
Date: Thu, 04 Dec 2014 22:42:11 +0000 [thread overview]
Message-ID: <1417732931.20814.16.camel@segulix> (raw)
Hi, I'm trying find a solution where I can change file in a devel
environment , and not commit it into git .
git update-index --assume-unchanged <file>
is one solution , not the best solution but one solution.
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
but
git commit .
# Changes to be committed:
# modified: configurations/local.defs
# modified: processor/default.defs
this is a bug ?
Anyway what is best way to deal with some files where we want change
locally and not commit in git .
The solution of have one environment variable that says if we are in
devel or in production , and system read the variable and choose the
files to read can't be applied in my case, and is a no solution , is
save a variable outside of source code which I can't.
Thanks,
--
Sérgio M. B.
next reply other threads:[~2014-12-04 23:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-04 22:42 Sérgio Basto [this message]
2014-12-05 6:12 ` bug report on update-index --assume-unchanged Sérgio Basto
2014-12-05 6:55 ` Johannes Sixt
2014-12-05 10:52 ` Duy Nguyen
2014-12-05 16:57 ` Sérgio Basto
2014-12-05 18:30 ` Junio C Hamano
2014-12-05 20:48 ` Philip Oakley
2014-12-05 21:05 ` Junio C Hamano
2014-12-05 21:55 ` Philip Oakley
2014-12-05 22:18 ` Andreas Schwab
2014-12-06 0:45 ` Sérgio Basto
2014-12-06 13:28 ` Philip Oakley
2014-12-05 21:19 ` Junio C Hamano
2014-12-05 21:39 ` Sérgio Basto
2014-12-05 21:52 ` Junio C Hamano
2014-12-05 18:33 ` Junio C Hamano
2014-12-05 10:56 ` [PATCH] commit: ignore assume-unchanged files in "commmit <file>" mode Nguyễn Thái Ngọc Duy
2014-12-09 2:44 ` Sérgio Basto
2014-12-11 23:23 ` Philip Oakley
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=1417732931.20814.16.camel@segulix \
--to=sergio@serjux.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).