git - How to see diff between working directory and staging index? -

-

we can see difference between repository , working directory with:

git diff

we can see difference between repository , staging index with:

git diff --staged

but how see difference between working directory , staging index?

actually, git diff between index , working tree

git diff head between repo , working tree.

see 365git.tumblr.com post:

git diffs


Comments

Post a Comment

Popular posts from this blog

angularjs - Showing an empty as first option in select tag -

-
my app showing empty select field first entry. have read other solution given , tried still not working. my controller code is: .controller('usercreatecontroller', function(user,profile,auth) { alert("hello"); var vm = this; vm.type = 'create'; profile.all() //this service fetch profiles shown in select field .success(function(data){ vm.profile = data; }); vm.userdata.profile = vm.profile[0]; //here have set default value select field and html page is: <label class="col-sm-2 control-label">profile</label> <div class="col-sm-8"> <select ng-model="user.userdata.profile" ng-options="person._id person.profilename person in user.profile"> </select> </div> hierarchy of vm.profile { "_id": 46, "profile": objectid("5516498e95b84548156db754"), "isactive": true, "password": "$2...
Read more

python - argument 2 to map() must support iteration -

-
hi i'm making basic raycast engine think nice start minimap problem class map ask mapgrid in constructor , when pass python give me error argument 2 map() must support iteration this code: main part import pygame def map(object): def __init__(self,grid,scale): self.grid= grid self.mapwidth= len(grid[0]) #number of map blocks self.mapheight= len(grid) self.minimapscale= scale #how many pixels draw map block self.miniwidth= self.mapwidth * self.minimapscale #size of minimap self.miniheight= self.mapheight * self.minimapscale self.rectgrid= grid y in range(self.mapheight): x in range(self.mapwidth): self.rectgrid[y][x]= pygame.rect(x,y,self.miniwidth,self.miniheight) def blitminimap(): pass data file mapgrid= [ [1,1,1,1], [1,0,0,1], [1,0,0,1], [1,1,1,1] ] size = [640, 480] map class import pygame def map(object): def __init__(self,grid,sc...
Read more

How to wrap some text in a rectangle in QML? -

-
i have perform simple task: want display piece of text inside rectangle , size of rectangle should precisely width of text. in c++, it's easy do. define qstring , apply qfontmetrics width. define rectangle graphics element have size. it's done within 5 minutes. i have heard qml easier use. therefore, expecting solve problem in less 5 minutes. didn't, , i'm still stuck @ it. here's have tried: rectangle { width: mytext.contentwidth height: mytext.contentheight text { anchors.fill:parent id: mytext font.family: "helvetica" font.pointsize: 50 text: qstr("the string want display") } } this doesn't work reason don't understand. have found way in way doesn't suits needs: rectangle { width: 100 height: 100 mousearea { id: mymousearea anchors.fill: parent onclicked: parent.width=mytext.contentwidth hoverenabled: true } t...
Read more