On 10/08/2013 12:39 PM, Colomban Wendling wrote:
Le 08/10/2013 20:53, Tory Gaurnier a écrit :
On 10/08/2013 02:11 AM, Lex Trotman wrote:
[...]
Also could you put your changes in a branch, not master, so they are
easier to identify.
[...]
That's what I was originally doing, but I forgot to switch back to it,
and accidentally commited everything to master :P As you can tell I'm
totally new to git.
So, should I just upload the secondary branch, or is there a way I can
restore the master branch to it's original form?
If you want to branch master and restore it as it's original form, you
can do:
Go on master:
$ git checkout master
Create a new branch reflecting the current one's state:
$ git checkout -b your-new-branch
Go back to master as the previous command went to the new branch:
$ git checkout master
Reset the current branch (master) to the state of origin/master:
$ git reset --hard origin/master
*WARNING:* make sure you properly branched before or backed up your
commits in some way before executing the last command, because it will
*drop* the new commits from the branch you're on (master) -- hence if
they aren't in any other branch they are orphaned and you probably won't
know how to get them back.
Regards,
Colomban
_______________________________________________
Devel mailing list
Devel@lists.geany.org
https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Ok, I think I got it, just to be on the safe side is archived my work
and put it in a different directory, but I created a new branch
qml-support (I had a qml_support branch before, but I deleted it to keep
to the naming conventions of the other branches ['-' instead of '_']). I
set the qml-support branch as my default remote branch, then I deleted
the master branch, and reuploaded it without my commits.
Does it look like I did it right?
_______________________________________________
Devel mailing list
Devel@lists.geany.org
https://lists.geany.org/cgi-bin/mailman/listinfo/devel
