git - Review changes from multiple commits -


i'm using git-svn work svn repository. 1 of things want able review changes git diff , nice options.

sometimes, "work-in-progress" changes committed svn, , want wait until work finished before reviewing. i'm wondering if there's invocation of git diff let me see these related changes, without intervening commits.

visually, have:

* e00 yet more irrelevant stuff * a04 finish work * a03 more wip * d00 irrelevant stuff * a02 more wip * c00 other irrelevant stuff * a01 more wip * a00 start wip * b00 state of tree before wip starts

i want able see cumulative effect of a** commits on top of b00, without c00, d00, or e00. git diff b00 a04 has irrelevant changes. git show a0{0,1,2,3,4} gives intermediate noise.

i'd able without creating throw-away branch, current approach does.

similar questions here , here.

you need temporary place aggregate changes, current method fine. can use unnamed branch (a "detached head") make automatically go away:

$ git checkout --detach b00

(or without --detach, a00^: either way, current b00 detach head), before:

$ git cherry-pick a0{0,1,2,3,4} $ git diff master... $ git checkout master

and you're done: there's no branch delete.


Comments

Post a Comment

Popular posts from this blog

How to remove text and logo OR add Overflow on Android ActionBar using AppCompat on API 8? -

have researched death , cannot find answer. i have actionbar using appcompat. supporting api v7 (api v8 do). actionbar works api v11. api < v11 has problem of removing icon (and feature) actionbar without supplying overflow. big picture have app logo, app title, , 3 icons squidging same actionbar on low end phone. trying make room! i happy 1 of 2 solutions. either: a method of getting overflow functionality can retrieved pull down. (preferred) method of removing icon , text actionbar below current xml api 11+: <resources> <!-- base application theme api 11+. theme replaces appbasetheme res/values/styles.xml on api 11+ devices. --> <style name="appbasetheme" parent="theme.appcompat.light.darkactionbar"> <item name="android:actionbarstyle">@style/liteactionbarstyle</item> <item name="actionbarstyle">@style/liteactionbarstyle</item> </st...
Read more

html - How to style widget with post count different than without post count -

i have border below li elements in wordpress widget types appropriate. element inside set block gives them nice easy click full width. the problem, when choose option "show post count" when adding widget such categories or archives displays post count plain text after tag , because tag block pushes post number text line below. whether choose show post count or not show post count still gives exact same element identifyer example "widget_categories". how style post count not on next line still keep links non post count list items full width? here's example on sidebar www.bbmthemes.com/themes/modular/blog-standard/ in order solve problem need remove display:block; for ul.widgets ul a , add in it's place line-height: 33px; what going achieve have same visual effect. what going lose doing links going work on text , not on "box". the other way out of find post count coming , make changes this. example change text count i...
Read more

url rewriting - How to redirect a http POST with urlrewritefilter -

i have question urlrewritefilter , until not find in net. i want redirect http post in tomcat7. here example... the call http post ulr http://localhost:8080/oldapplication/example?a=123&b=2 this call contains content either xml or json. filter configured works , urlrewrite.xml contains: <?xml version="1.0" encoding="utf-8"?> <!doctype urlrewrite public "-//tuckey.org//dtd urlrewrite 4.0//en" "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd"> <urlrewrite use-query-string="true"> <rule> <condition type="method">post</condition> <from>^(.*)$</from> <to type="redirect">/newapplication$1</to> </rule> </urlrewrite> in access log can see call http://localhost:8080/oldapplication/example?a=123&b=2 gets redirected http://localhost:8080/newapplication/example?a=123&b=2 fine until now. pr...
Read more