Git - added wrong folder source

Question

So I have a git stash master branch(?) and I CD'd into the wrong folder and pushed all the contents to the master.

How do I get rid of everything and start again, and push the correct folder contents?

git init
Initialized empty Git repository in D:/apps/myapp_old/.git/
git add --all
git commit -m "Initial commit"
git remote add origin https://url/my_app.
git push -u origin master

I tried this:

$ git rm -r *
fatal: pathspec 'tmp' did not match any files

I'm confused. You initialized a new git repo and committed the wrong source folder? If that's the case, you can just remove the `.git` folder to wipe out the repo. — TriskalJM, Mar 22 '16 at 17:06
so just delete it from my local folder? But all the files will still be in my github (well technically stash) — user3437721, Mar 22 '16 at 17:08
Still confused. You did a `git init`. That initializes a new repo in a local directory. No github (or stash) involved there. — TriskalJM, Mar 22 '16 at 17:14
Yikes. If you're working with a remote, you should really use `git clone` to create a local version, not init a new one and add a remote. — TriskalJM, Mar 22 '16 at 17:17

score 2 · Accepted Answer · edited Jun 20 '20 at 09:12

2

How do I get rid of everything and start again, and push the correct folder contents?

If you just want to remove the current content of the repository and start all over again:

Simply delete the .git folder and add any content you want

  rm -rf .git 
  git init 
  git add .
  git commit -m "message"

How to remove content already in the remote repo?

# remove any content from the repo
git rm --cached <any files you want to remove"

# update the removed files
git add . -A 

# commit the file you have deleted
git commit -m "..."

# push changes
git push origin <branch>

NOTE: The content will be in the repository and in the next commits it will be removed

How to remove content from the repository and all its history

You can user interactive rebase of git filter-branch

In order to edit and change the history (rebase) follow those steps:

// X is the number of commits you wish to squash
git rebase -i HEAD~X

Once you squash your commits - choose the e for edit, when the process stops remove the desired file and then continue and commit your changes.

Once you have completed the rebase push the changes with git push -f

NOTE: Rebase is a destructive and should only be done on branches which no one else has checkout or their work will be lost.

More Options:

How to change the content of the repo - reverting or undoing

edited Jun 20 '20 at 09:12

Community

1
1

answered Mar 22 '16 at 17:10

CodeWizard

128,036
21
144
167

so I just cd to my new folder and push from there? – user3437721 Mar 22 '16 at 17:11
yep. `rm -rf .` , `git init`, `git add .`, `git commit -m "message"` and that it – CodeWizard Mar 22 '16 at 17:12
but what about the files that already exist which have been pushed up to stash? – user3437721 Mar 22 '16 at 17:15
Ha, got you now, updating the answer accordingly. – CodeWizard Mar 22 '16 at 17:17
$ git rm --cached -r * fatal: pathspec 'tmp' did not match any files – user3437721 Mar 22 '16 at 17:23
remove the -r, still updating my answer, will take few more minutes to complete – CodeWizard Mar 22 '16 at 17:23
Since you had a new repository you can simply delete the remote repo on the server, follow the above steps in the comment and push again. – CodeWizard Mar 22 '16 at 17:29
Ok I trust you, great help – user3437721 Mar 22 '16 at 18:26
It you have any problems add comments and ill help you to resolve it. – CodeWizard Mar 22 '16 at 18:39

score 1 · Answer 2 · answered Mar 22 '16 at 17:19

1

You're going to have to remove all of the source files that you accidentally added in your local branch, recommit, and re-push to the remote.

answered Mar 22 '16 at 17:19

TriskalJM

2,393
1
19
20

Git - added wrong folder source

2 Answers2

How to remove content already in the remote repo?

How to remove content from the repository and all its history

More Options: