gitignore - Can I 'git commit' a file and ignore its content changes? -

-

every developer on team has own local configuration. configuration information stored in file called devtargets.rb used in our rake build tasks. don't want developers clobber each other's devtargets file, though.

my first thought put file in .gitignore list not committed git.

then started wondering: possible commit file, ignore changes file? so, commit default version of file , when developer changes on local machine, git ignore changes , wouldn't show in list of changed files when git status or git commit.

is possible? nice feature...

sure, time time using 

git update-index --assume-unchanged [<file> ...]

to undo , start tracking again (if forgot files untracked, see question):

git update-index --no-assume-unchanged [<file> ...]

relevant documentation:

--[no-]assume-unchanged
when flag specified, object names recorded paths not updated. instead, option sets/unsets "assume unchanged" bit paths. when "assume unchanged" bit on, user promises not change file , allows git assume working tree file matches recorded in index. if want change working tree file, need unset bit tell git. helpful when working big project on filesystem has slow lstat(2) system call (e.g. cifs).

git fail (gracefully) in case needs modify file in index e.g. when merging in commit; thus, in case assumed-untracked file changed upstream, need handle situation manually.

fail gracefully in case means, if there changes upstream file (legitimate changes, etc.) when pull, say:

$ git pull … https://github.com/x/y    72a914a..106a261  master     -> origin/master updating 72a914a..106a261 error: local changes following files overwritten merge:                 filename.ext

and refuse merge.

at point, can overcome either reverting local changes, here’s 1 way:

 $ git checkout filename.ext

then pull again , re-modify local file, or set –no-assume-unchanged , can normal stash , merge, etc. @ point.


Comments

Post a Comment

Popular posts from this blog

windows - Why does Vista not allow creation of shortcuts to "Programs" on a NonAdmin account? Not supposed to install apps from NonAdmin account? -

-
i'm working on installer (using wise installer, older version 1999). i'm creating shortcut in programs group exe. i'm creating shortcut on desktop. if install run admin account, create shortcut on common desktop , common program group (i.e., read hkey_local_machine\explorer\shellfor users). if it's installed nonadmin account, install hkey_current_user's desktop , program group. behavior install on: xp nonadmin - desktop , program shortcuts install ok. vista admin - desktop & program shortcuts install ok. vista non-admin, uac off - desktop shortcut installs, program shortcut not . however, program group folder they're supposed installed does created. at end of install, launch program group has shorcut. launches in of above. can manually drag shortcut folder , works fine. i'm bloody baffled. i've tried installing other commercial apps (opera, foxit, firefox) firefox install under nonadmin (and if select other program files,...
Read more

c++ - How do I get a multi line tooltip in MFC -

-
right now, have tool tip pops when hover on edit box. problem tool tip contains multiple error messages , in 1 long line. need have each error message on own line. error messages contained in cstring new line seperating them. my existing code below. bool ontooltiptext(uint, nmhdr* pnmhdr, lresult* presult) { assert(pnmhdr->code == ttn_needtexta || pnmhdr->code == ttn_needtextw); // need handle both ansi , unicode versions of message tooltiptexta* pttta = (tooltiptexta*)pnmhdr; tooltiptextw* ptttw = (tooltiptextw*)pnmhdr; // tchar szfulltext[256]; cstring strtiptext=_t(""); uint nid = pnmhdr->idfrom; if (pnmhdr->code == ttn_needtexta && (pttta->uflags & ttf_idishwnd) || pnmhdr->code == ttn_needtextw && (ptttw->uflags & ttf_idishwnd)) { // idfrom hwnd of tool nid = ::getdlgctrlid((hwnd)nid); } //m_errprojaccel[ch] contains 1 or more error messages each...
Read more

unit testing - How to mock PreferenceManager in Android? -

-
i've written class using context , third party library , sharedpreferences preferencemanager . it's possible mock context , third party library can mocked using mocking framework, preferencemanager ? i have 2 methods: public void savestring(thirdpartyobject obj) { sharedpreferences apppreferences = preferencemanager.getdefaultsharedpreferences(mcontext); sharedpreferences.editor editor = apppreferences.edit(); editor.putstring(mcontext.getstring( r.string.preferences_string_name), obj.getstring()); editor.commit(); } and corresponding, loads preferences. it doesn't want mock instance of preferencemanager (which used in preferencefragment or preferenceactivity ). you want either: a mock sharedpreferences , in case can mock context#getsharedpreferences (which called preferencemanager#getdefaultsharedpreferences anyhow). you'll have make mock sharedpreferences.editor if preferences edited, above. know how moc...
Read more