Re: Ignore on commit

2012-10-05 Thread Pascal Obry
Marco, > 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. Got it thanks! Would be useful some time indeed. -- Pa

Re: Ignore on commit

2012-10-05 Thread Marco Craveiro
> From the help page: > > --assume-unchanged, --no-assume-unchanged > ... > > This option can be also used as a coarse file-level mechanism to > ignore uncommitted changes in tracked files (akin to what .gitignore > does for untracked files). > > Seems like it does everything required.

Re: Ignore on commit

2012-10-05 Thread Philip Oakley
From: "Andrew Ardill" On 5 October 2012 07:20, 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

Re: Ignore on commit

2012-10-04 Thread Andrew Ardill
On 5 October 2012 12:20, Sitaram Chamarty wrote: > On Fri, Oct 5, 2012 at 7:05 AM, demerphq wrote: >> On 5 October 2012 03:00, Andrew Ardill wrote: >>> On 5 October 2012 07:20, Marco Craveiro wrote: ... Similar but not quite; the idea is that you know that there is some code (I'm

Re: Ignore on commit

2012-10-04 Thread Junio C Hamano
Sitaram Chamarty writes: >> Git ignore doesn't ignore tracked files. > > would 'git update-index --assume-unchanged' work in this case? Didn't > see it mentioned in any of the replies so far (but I have never used > it myself) The assume-unchanged bit is *not* an instruction to tell Git to igno

Re: Ignore on commit

2012-10-04 Thread Sitaram Chamarty
On Fri, Oct 5, 2012 at 7:05 AM, demerphq wrote: > On 5 October 2012 03:00, Andrew Ardill wrote: >> On 5 October 2012 07:20, 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

Re: Ignore on commit

2012-10-04 Thread demerphq
On 5 October 2012 03:00, Andrew Ardill wrote: > On 5 October 2012 07:20, 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 p

Re: Ignore on commit

2012-10-04 Thread Andrew Wong
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 ignor

Re: Ignore on commit

2012-10-04 Thread Marco Craveiro
> I'm not sure to follow everything... But looks like: > >$ git add -p > > or > >$ git add -i > > should do what you want, no? > > You select the hunks to commit, let over the "hacks" and then > >$ git commit Similar but not quite; the idea is that you know that there is some code (I'

Re: Ignore on commit

2012-10-04 Thread Pascal Obry
I'm not sure to follow everything... But looks like: $ git add -p or $ git add -i should do what you want, no? You select the hunks to commit, let over the "hacks" and then $ git commit -- Pascal Obry / Magny Les Hameaux (78) The best way to travel is by means of imaginatio