Get the SHA1 hash of the commit that you wish to revert to.
% git log
...
commit 9ce5e10ac4fe43e9b580344454dd27172b6c4456
Author: Simon Cornelius P. Umacob
Date: Tue Jan 20 16:30:42 2009 +0800
show/hide icmp6box
commit f193cf92b2c925a2f3f71a713d766efd1e4d81e0
Author: Simon Cornelius P. Umacob
Date: Tue Jan 20 15:52:39 2009 +0800
Merge IPv6 changes
commit 1f9f2a95b7b42cf33e730535092e56e214fdb848
Author: Simon Cornelius P. Umacob
Date: Tue Jan 20 14:55:07 2009 +0800
Merge IPv6 changes
commit ce996bd3014b05fea5eaffd7c738c5c549fd7677
Author: Simon Cornelius P. Umacob
Date: Tue Jan 20 14:30:27 2009 +0800
add IPv6.inc and NetUtils.js
...
% git reset --hard ce996bd3014b05fea5eaffd7c738c5c549fd7677
HEAD now points to ce996bd3...
To go back to the "original" HEAD, find its SHA1 hash and reset your current HEAD to that state.
% git reflog
simoncpu@pfsense:/home/pfsense/simoncpu-IPv6> git reflog
74fb85b... HEAD@{0}: pull [email protected]:pfsense/mainline.git: Fast forward
9ce5e10... HEAD@{1}: commit: show/hide icmp6box
f193cf9... HEAD@{2}: commit: Merge IPv6 changes
1f9f2a9... HEAD@{3}: commit: Merge IPv6 changes
ce996bd... HEAD@{4}: commit: add IPv6.inc and NetUtils.js
cfc4dab... HEAD@{5}: clone: from http://gitweb.pfsense.org/pfsense/simoncpu-IPv6.git
% git reset --hard 74fb85b
Note that you need not use the full SHA1 string to refer to an object.
The first few characters is enough.
Autistic thoughts from a computer weirdo.
Wednesday, January 21, 2009
HOWTO Revert your Git repo to a certain commit
Labels:
git,
open source,
pfsense
Friday, January 16, 2009
pfSense IPv6
I'm currently merging our IPv6 changes to pfSense by hand so that I can commit our changes upstream once their migration from CVS to git is complete.
"With a thousand eyes, all bugs are shallow", they say. Sharing this code to the world will most likely uncover many bugs and make our code more stable. I just hope that with a thousand eyes, I won't receive a thousand flak from users in case I break something.
I'll probably break something. :)
UPDATE: As of January 16, 2011, development has been stopped. If you wish to continue development, please contact me (simoncpu at gmail.com) or post a bounty. Thanks! :)
(whoah, I realized that this post was made exactly 2 years ago lol)
"With a thousand eyes, all bugs are shallow", they say. Sharing this code to the world will most likely uncover many bugs and make our code more stable. I just hope that with a thousand eyes, I won't receive a thousand flak from users in case I break something.
I'll probably break something. :)
UPDATE: As of January 16, 2011, development has been stopped. If you wish to continue development, please contact me (simoncpu at gmail.com) or post a bounty. Thanks! :)
(whoah, I realized that this post was made exactly 2 years ago lol)
Labels:
ipv6,
open source,
pfsense
Friday, January 09, 2009
HOWTO let lighttpd listen to both IPv4 and IPv6 requests on *BSD
Problem
When enabling IPv6 using server.use-ipv6 = "enable", lighttpd no longer listens to IPv4 requests.
Solution
Set a sysctl knob so that it will accept both IPv4 and IPv6 requests:
When enabling IPv6 using server.use-ipv6 = "enable", lighttpd no longer listens to IPv4 requests.
Solution
Set a sysctl knob so that it will accept both IPv4 and IPv6 requests:
root@soulfury:~# sysctl net.inet6.ip6.v6only=0
Subscribe to:
Posts (Atom)