Removing pulled git branch

[TheCastellum]

Hello,

I haven't really used Git much, so forgive me for my ignorance. I was downloading some of the branches of different addon-projects and it failed to compile, and I would just prefer to remove it. I used the following method to acquire the source:

git pull git://github.com/Paradox/mangos.git master

Now, I know I can just start all over, but I have other custom code added, and it would be a pain to re-add it all. And if there is no way to do it with the method I used, is there a better method that would allow me management of the specific branches I download?

Thank you in advance,

TheCastellum.

[darkstalker]

try:

git rebase --interactive HEAD~10

remove the lines of unwanted commits and save

[TheCastellum]

Thanks, worked like a charm. A little annoying to do with a lot of commits, but worked nonetheless.

[freghar]

Since you asked so nicely;

As you may know, a pull is fetch+merge (ie. download objects + somewhat connect several branches). Merge connects two or more branches, so you can just hard-reset to previous state of any of them.

Imagine you have your own branch (left) and just merged another one (via pull):

|
*
|
M
|  \\
*  *
|   |
*  *
|   |

git-reset accepts several referency specification formats, HEAD~1 (or branchname~1) refers to "one commit back" (or "the second topmost commit of branchname"). Thus, when you're at point "M" (ie. your last commit is the merge), you can simply git reset --hard HEAD~1 to get your clean state before any merge. A special syntax can be used for merges, HEAD^ or HEAD^1 means the first parent, HEAD^2 the second, ..., see "man git-rev-parse" (section SPECIFYING REVISIONS) for a complete manual.

Another way is to use reflog, something like HEAD@{1} means "HEAD one step back". You can use HEAD@{10.minutes.ago} , which - surprisingly - works as well!

[TheCastellum]

Hello again,

I tried to remove another branch using the first method, but git gives me the following error:

Interactive rebase already started

After looking on Google, I discovered how to fix this, but sadly the fix does not seem to work on Windows platforms. The solution I found for Linux (and possibly Windows, but does not work on my machine) is as follows:

cd .git
rm -rf .dotest-merge

There is no such directory in my .git directory, so I am wondering if it something that only has to do with Linux git exclusively.

Any ideas are welcome,

TheCastellum.

[freghar]

git rebase --abort

[xeross155]

or if you're still in a rebase git rebase --continue

[freghar]

That will effectively screw things up on the repo level. --abort is the safest method.

[xeross155]

Ye I ment that if you're still actively rebasing when you edit a commit for example, guess it's a bit unrelated though.