From: Andrew Wong <andrew.kw.w@gmail.com>
To: Marco Craveiro <marco.craveiro@gmail.com>
Cc: pascal@obry.net, git@vger.kernel.org
Subject: Re: Ignore on commit
Date: Thu, 04 Oct 2012 19:02:34 -0400 [thread overview]
Message-ID: <506E158A.2020903@gmail.com> (raw)
In-Reply-To: <CAKRNd4wbT_boRyFOOL_95FBW4ws8Zzz2ubVCfXuRSevzPdhW9g@mail.gmail.com>
On 10/04/2012 05:20 PM, Marco Craveiro wrote:
> Similar but not quite; the idea is that you know that there is some
> code (I'm just talking about files here, so lets ignore hunks for the
> moment) which is normally checked in but for a period of time you want
> it ignored. So you don't want it git ignored but at the same time you
> don't want to see these files in the list of modified files.
The way I usually handle this scenario is by actually making a temporary
commit with those temporary changes. And whenever I make a permanent
commit, I'll use "rebase -i" to rearrange the commits so that all my
permanent commits go before my temporary commits. So when I need to
push, I'll just push up till before my temporary commits.
This way I also get to make permanent changes in files that I have
temporary changes.
next prev parent reply other threads:[~2012-10-04 23:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 16:45 Ignore on commit Marco Craveiro
2012-10-04 20:06 ` Pascal Obry
2012-10-04 21:20 ` Marco Craveiro
2012-10-04 23:02 ` Andrew Wong [this message]
2012-10-05 1:00 ` Andrew Ardill
2012-10-05 1:35 ` demerphq
2012-10-05 2:20 ` Sitaram Chamarty
2012-10-05 2:44 ` Junio C Hamano
2012-10-05 2:44 ` Andrew Ardill
2012-10-05 6:09 ` Marco Craveiro
2012-10-05 7:00 ` Philip Oakley
2012-10-05 13:30 ` Pascal Obry
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=506E158A.2020903@gmail.com \
--to=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=marco.craveiro@gmail.com \
--cc=pascal@obry.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).