>>> Eddie Wai <eddie....@broadcom.com> schrieb am 28.01.2014 um 20:09 in >>> Nachricht <1390936148.25423.521.ca...@lbirv-waie-lx2.broadcom.com>: > On Tue, 2014-01-28 at 12:10 -0600, Mike Christie wrote: >> On 01/28/2014 04:54 AM, Hannes Reinecke wrote: >> > On 12/23/2013 07:38 PM, Mike Christie wrote: >> >> On 12/23/2013 12:12 PM, Eddie Wai wrote: >> >>> On Mon, 2013-12-23 at 02:35 -0600, Mike Christie wrote: >> >>>> On 12/11/2013 05:38 PM, Eddie Wai wrote: >> >>>>> Signed-off-by: Eddie Wai <eddie....@broadcom.com> >> >>>>> --- >> >>>>> iscsiuio/configure |11348 > +++++++++++++++++++++++++++++----------------------- >> >>>>> 1 files changed, 6426 insertions(+), 4922 deletions(-) >> >>>> >> >>>> Patches look fine. Only problem is that for this one it did not apply >> >>>> cleanly. I got the attached rejects. >> >>> Thanks for applying the patches, Mike. >> >>> >> >>> I just re-cloned your tree from github and still was not able to see the >> >>> aforementioned patch conflict. Perhaps there's a different code base >> >>> that I should fetch from? Thanks. >> >>> >> >> >> >> Can you resend the patch as an attachment? >> >> >> > Where is the point of this patch? >> > 'configure' is auto-generated from 'configure.ac'. >> > And is likely to change, depending on the machine/system/OS >> > you're generating it at. >> > >> > Please remove it from tracking. >> > >> >> You mean add it to .gitnore? Yeah, sounds better. >> >> Eddie, could you send a patch to add a .gitignore file for iscsiuio? >> There are other files like config.h.in. > Entries in .gitignore seems to only explicitly prevent the named > untracked file(s) from being tracked. For already tracked files like > iscsiuio/configure, it doesn't seem to have any effects.
AFAIK, a "double-strategy" will work: First add your file to .gitignore, then (if the file is auto-created) do "git rm the_file" to remove it from the filesystem and "stage" it for removal. After commit your file won't be part of the latest revision... Ulrich > >>From what I understand, I would think the goal is more like removing the > iscsiuio/configure file from the library in general. I can generate the > patch which will rm the file from git along with an explicit line to > exclude it in .gitignore. > > > -- > You received this message because you are subscribed to the Google Groups > "open-iscsi" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to open-iscsi+unsubscr...@googlegroups.com. > To post to this group, send email to open-iscsi@googlegroups.com. > Visit this group at http://groups.google.com/group/open-iscsi. > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "open-iscsi" group. To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscr...@googlegroups.com. To post to this group, send email to open-iscsi@googlegroups.com. Visit this group at http://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/groups/opt_out.
