github - Git: which commands make a local repository identical to the remote one? -


i have read git-scm.com/book , questions on stackoverflow have been answered, still have 1 question don't answer for. here use case:

locally, have cloned remote repository (get clone). repository rather big, thousands of nested folders , files. work files in repository. of them modified. others deleted. also, files added. after i'm done changes, don't want save them in local repository (git add, git commit) , push/merge them to/with remote ones (git push). want following:

a) files changed locally being replaced corresponding files remote repository (all conflicts ignored, remote file versions have higher priority);

b) files missing locally being copied remote repository;

c) newly created files exist locally don't exist remotely remain untouched.

question: set of git commands able done?

thanks, racoon

this should it:

git reset --hard git clean -df

the first command resets tracked files, second 1 removes untracked files. note not touch ignored files. add -x remove ignored files.


Comments

Post a Comment

Popular posts from this blog

toolbar - How to add link to user registration inside toobar in admin joomla 3 custom component -

im trying write component admin side , need add user creation. dont want duplicate existing codes add link. know how add task not simple link toolbar. thx help. if wanting button opens new user screen can try in component: $bar = jtoolbar::getinstance('toolbar'); $bar->appendbutton('link', 'users', 'new user','index.php?option=com_users&task=user.add'); you need add view.html.php file wherever you're creating toolbar. is need?
Read more

linux - disk space limitation when creating war file -

i have 1 gb disk space limitation hosting app , have used 700mb of it. however want create war file directory big (around 600mb) using command : jar -cvf root.war folderpath that's why encounter quota limitation , can't following. i'm looking way delete folder content when it's applying archive conserve disk space take note can't install zip tool in ssh shell ~ the code works on test directories, test first anyway, deletes files. it's not efficient. assumptions: 300mb free space, in destructively compress 600mb folderpath directory. none of files big -- if file in folderpath 300mb or larger, fail. notes: if ' $out ' file exists, nothing. first find pipes file list while , if ' $out ' doesn't exist in loop, create it, don't update -- if does exist, update it. each pass adds 1 more file, deletes unless file directory. after loop finishes delete empty directories too. unset u ; in=folderpath ; out=roo...
Read more