CODEWITHSUNDEEP
gitgithubgit-branch
Ruben Rubovski
Ruben Rubovski

Reputation: 21

Using Git in reverse... big mistake I made

I've made a mistake by not using git from the start of my project. I've downloaded an OS project, made some customizations, and now I would like to:

1) compare the original branch/project to mine to see the files I changed and updated 2) update my project with the files from original source that I did not change

I have no idea how to do this.

Upvotes: 0

Views: 59

Answers (3)

Caspar
Caspar

Reputation: 7

It's worth nothing that, if you are not already a contributor to the repository, you will probably have to submit a pull request. If git is giving you problems, you can: $ diff dir1 dir2.

Otherwise, just git clone the original repository, cp the entire contents of the edited directory to the original repository, and run git diff (or git status, after you've committed) in there.

Upvotes: 0

cowbert
cowbert

Reputation: 3452

If you: 1. git checkout the original branch somewhere 2. copy your modified to that working copy

then you can diff...

It might be better practice to branch the original checkout, copy to that branch, commit, then you can just keep developing on the new branch. This enables future flexibility with merging to upstream...

Upvotes: 0

jnevelson
jnevelson

Reputation: 2092

You can re-download the original project and initialize it as a git repo (git init). Make sure to commit the project (git commit). Then copy/paste all your changes into that same directory. Running git diff at that point should show you everything you changed.

Upvotes: 1

Related Questions