git - revert commits and merges not appearing in HEAD "history" -


after did revert commit followed merge, contributor made several (3) commits , wanted inspect them using git diff head^^^ head showed chunks sure updated previous commits. using git show came conclusion revert commit , content of merge not taken account when using either of head[^...][~...] shortcuts.

here relevant outputs:

$git log -7 3 hours ago 6bcab3e omglolol jun   <--this branch master head 4 hours ago 0682cd5 otherfucking editeur de map jun 4 hours ago 83b61da motherfucking editeur de map jun 5 hours ago caf26e1 merge branch 'welcome' nath@home 5 hours ago 5ddbbd0 revert "back menu" nath@home 5 hours ago 2cb664c user can go fkin everywhere nath@home   <--made on branch welcome 6 hours ago 06221f9 menu jun  $git show head^^ 4 hours ago 83b61da motherfucking editeur de map jun <diff follows...>  $git show head^^^ 6 hours ago 06221f9 menu jun <diff follows...>  $git --version git version 1.8.1.2 <--packaged linux mint 15

as seems, understanding of head... shortcuts seems failing here, did not find information on goes further usual bread , butter cases. enlighten me on this

this problem after merged master 'welcome' branch, 'master' branch has 2 parents, namely previous commit in 'master', , latest commit in 'welcome'. saying "give me state of world 3 commits ago" ambiguous, , default git shows last commit in unmerged branch. git head^^^^2 give state of world in second parent of 'master' before merge.

see what's difference between head^ , head~ in git?


-

Comments

Post a Comment

Popular posts from this blog

how to proxy from https to http with lighttpd -

i have internal site (192.168.2.1) accessible http on different server run public web-server using lighttpd. can make internal site accessible outside work follows $http["host"] == "internal.example.com" { ... proxy.server = ( "" => ( "internal" => ( "host" => "192.168.2.1", "port" => 8000 ) ) } this works, use https outside world. question is, how can proxy going https http ? i've tried this: $server["socket"] == ":443" { $http["host"] == "internal.example.com" { ... proxy.server = ( "" => ( "internal" => ( "host" => "http://192.168.2.1", "port" => 8000 ) ) } } but doesn't seem wor...
Read more

android - Automated my builds -

i have multiple app , android project want automated in build , release sequence. have ant script build , create apk of app. want have 1 script or ant file start build sequence app. maybe don't konw search, can't find easy documentation on ant. the point of use jenkins ant (or maven, i'm not sure of difference between them now) automated build sequence when people commit on project. any int appreciated maven dependencies (over ant) don't need pass around jars. recommend maven on ant day. syntax , overall process easier understand, @ end of both build tools. if able to, more recommend upgrading gradle. easy create different build types , create them ./gradlew assemble here project jake wharton can see power of gradle. there release , debug build, can make lot more if like. https://github.com/jakewharton/u2020 here android docs gradle http://tools.android.com/tech-docs/new-build-system/user-guide . if can't find looking here, check out main grad...
Read more

python - Flask migration error -

i've got application build on flask , wanted create new migration today. when run $python manage.py db upgrade i got message raise util.commanderror('only single head supported. ' alembic.util.commanderror: single head supported. script directory has multiple heads (due branching), must resolved manually editing revision files form linear sequence. run alembic branches see divergence(s). so run command $alembic branches no config file 'alembic.ini' found, or file has no '[alembic]' section any clue on about? the error messages coming alembic, use command form alembic <command> , integrating flask coming flask-migrate, need use form python manage.py db branches . to resolve multiple branches, make 1 of branches point down other branch upgrade graph straight line. see alembic's docs on branches: http://alembic.readthedocs.org/en/latest/branches.html
Read more