To undo a merge that was NOT pushed:
    
    git reset --merge ORIG_HEAD

If during the merge you get a conflict, the best way to undo the merge is:

    git merge --abort

``git reset --hard HEAD~17`` takes you back 17 commits ahead of the head of master. ``git rebase -i HEAD~17`` probably gets rid of the extra commits as well.

Taken from [git reset][1] 


    Undo a merge or pull
    
        $ git pull                         &lt;1&gt;
        Auto-merging nitfol
        CONFLICT (content): Merge conflict in nitfol
        Automatic merge failed; fix conflicts and then commit the result.
        $ git reset --hard                 &lt;2&gt;
        $ git pull . topic/branch          &lt;3&gt;
        Updating from 41223... to 13134...
        Fast-forward
        $ git reset --hard ORIG_HEAD       &lt;4&gt;


  [1]: http://git-scm.com/docs/git-reset

This one will surely work!

    git reset --hard HEAD~1 
    git init

The first one will revert the changes you recently made (the merge)
the second will init the repo to latest (therefore will fast forward to latest on origin)

I&#39;ve tried

    git reset --merge
but it didn&#39;t do the trick.

I&#39;m trying to write a REST-API server with NodeJS like the one used by [Joyent][1], and everything is ok except I can&#39;t verify a normal user&#39;s authentication. If I jump to a terminal and do `curl -u username:password localhost:8000 -X GET`, I can&#39;t get the values username:password on the NodeJS http server. If my NodeJS http server is something like 

    var http = require(&#39;http&#39;);
    http.createServer(function (req, res) {
      res.writeHead(200, {&#39;Content-Type&#39;: &#39;text/plain&#39;});
      res.end(&#39;Hello World\n&#39;);
    }).listen(1337, &quot;127.0.0.1&quot;);

, shouldn&#39;t I get the values username:password somewhere in the **req** object that comes from the callback ?
How can I get those values without having to use [Connect&#39;s basic http auth][2] ?


  [1]: http://api.no.de
  [2]: http://senchalabs.github.com/connect/middleware-basicAuth.html

Basic HTTP authentication in Node.JS?

We are developing a top-down RPG using XNA. Recently we bumped into a setback when writing the code to display our maps. When drawing the map, top-down view with a normal transformation matrix, everything seems to be fine. When using a non-flat transformation matrix, such as squeezing the top or bottom to mimic depth, black lines (rows when top or bottom, column when left or right is squeezed) that move around when the camera changes position, appear. The movement and placement appear to be random. (Image provided further down.)

#**Background information**#
The maps consist of tiles. The original texture has tiles consisting of 32x32 pixels. We draw the tiles by creating 2 triangles and displaying part of the original texture on these triangles. A shader does this for us. There are three layers of triangles. First we draw all the opaque tiles and all opaque pixels of all semi-opaque and partial-transparent tiles, then all the semi-opaque and partial-transparent tiles and pixels. This works fine (but when we zoom by a floating point factor, sometimes color-blended lines are in between tile rows and/or columns). 

##_Renderstates_##
We use the same rasterizerState for all tiles and we switch between two when drawing solid or semi-transparent tiles. 

    _rasterizerState = new RasterizerState();
    _rasterizerState.CullMode = CullMode.CullCounterClockwiseFace;
            
    _solidDepthState = new DepthStencilState();
    _solidDepthState.DepthBufferEnable = true;
    _solidDepthState.DepthBufferWriteEnable = true;

    _alphaDepthState = new DepthStencilState();
    _alphaDepthState.DepthBufferEnable = true;
    _alphaDepthState.DepthBufferWriteEnable = false;

In the shade we set the SpriteBlendMode as follows:

The first solid layer 1 uses 

    AlphaBlendEnable = False; 
    SrcBlend = One; 
    DestBlend = Zero; 
 
All the other solid and transparent layers (drawn later) use 

    AlphaBlendEnable = True; 
    SrcBlend = SrcAlpha;
    DestBlend = InvSrcAlpha; 

Other shaders use this too. The `SpriteBatch` for the `SpriteFonts` used, uses default setting.


##_Generated Texture_##
Some tiles are generated on the fly and saved to file. The file is loaded when the map is loaded. This is done using a `RenderTarget` created as follows:
    
    RenderTarget2D rt = new RenderTarget2D(sb.GraphicsDevice, 768, 1792, false, 
        SurfaceFormat.Color, DepthFormat.None);
        sb.GraphicsDevice.SetRenderTarget(rt);

When generated, the file is saved and loaded (so we don&#39;t lose it when the device resets, because it no longer will be on a `RenderTarget`). I tried using mipmapping, but it is a spritesheet. There is no information on where tiles are placed, so mipmapping is useless and it didn&#39;t solve the problem.

##_Vertices_##
We loop through every position. No floating points here yet, but position is a Vector3 (Float3).

    for (UInt16 x = 0; x &lt; _width;  x++)
    {
        for (UInt16 y = 0; y &lt; _heigth; y++)
        {
            [...]
            position.z = priority; // this is a byte 0-5

To position the tiles the following code is used:

    tilePosition.X = position.X;
    tilePosition.Y = position.Y + position.Z;
    tilePosition.Z = position.Z;

As you know, floats are 32 bit, with 24 bits for precision. The maximum bit value of z is 8 bits (5 = 00000101). The maximum values for X and Y are 16 bits resp. 24 bits. I assumed nothing could go wrong in terms of floating points.

    this.Position = tilePosition;

When the vertices are set, it does so as follows (so they all share the same tile position)

    Vector3[] offsets  = new Vector3[] { Vector3.Zero, Vector3.Right, 
        Vector3.Right + (this.IsVertical ? Vector3.Forward : Vector3.Up), 
        (this.IsVertical ? Vector3.Forward : Vector3.Up) };
    Vector2[] texOffset = new Vector2[] { Vector2.Zero, Vector2.UnitX, 
        Vector2.One, Vector2.UnitY };

    for (int i = 0; i &lt; 4; i++)
    {
        SetVertex(out arr[start + i]);
        arr[start + i].vertexPosition = Position + offsets[i];

        if (this.Tiles[0] != null)
            arr[start + i].texturePos1 += texOffset[i] * this.Tiles[0].TextureWidth;
        if (this.Tiles[1] != null)
            arr[start + i].texturePos2 += texOffset[i] * this.Tiles[1].TextureWidth;
        if (this.Tiles[2] != null)
            arr[start + i].texturePos3 += texOffset[i] * this.Tiles[2].TextureWidth;
    }
  
##_Shader_##
The shader can draw animated tiles and static tiles. Both use the following sampler state:

    sampler2D staticTilesSampler = sampler_state { 
        texture = &lt;staticTiles&gt; ; magfilter = POINT; minfilter = POINT; 
        mipfilter = POINT; AddressU = clamp; AddressV = clamp;};

The shader doesn&#39;t set any different sampler states, we also don&#39;t in our code. 

Every pass, we clip at the alpha value (so we don&#39;t get black pixels) using the following line 

    clip(color.a - alpha)

Alpha is 1 for solid layer 1, and _almost_ 0 for any other layer. This means that if there is a fraction of alpha, it will be drawn, unless on the bottom layer (because we wouldn&#39;t know what to do with it).
  
##_Camera_##
We use a camera to mimic lookup from top down at the tiles, making them appear flat, using the z value to layer them by external layering data (the 3 layers are not always in the right order). This also works fine. The camera updates the transformation matrix. If you are wondering why it has some weird structure like this.AddChange - the code is Double Buffered (this also works). The transformation matrix is formed as follows:

    // First get the position we will be looking at. Zoom is normally 32
    Single x = (Single)Math.Round((newPosition.X + newShakeOffset.X) * 
        this.Zoom) / this.Zoom;
    Single y = (Single)Math.Round((newPosition.Y + newShakeOffset.Y) * 
        this.Zoom) / this.Zoom;

    // Translation
    Matrix translation = Matrix.CreateTranslation(-x, -y, 0);
    
    // Projection
    Matrix obliqueProjection = new Matrix(1, 0, 0, 0,
                                          0, 1, 1, 0,
                                          0, -1, 0, 0,
                                          0, 0, 0, 1);

    Matrix taper = Matrix.Identity; 

    // Base it of center screen
    Matrix orthographic = Matrix.CreateOrthographicOffCenter(
        -_resolution.X / this.Zoom / 2, 
         _resolution.X / this.Zoom / 2, 
         _resolution.Y / this.Zoom / 2, 
        -_resolution.Y / this.Zoom / 2, 
        -10000, 10000);
    
    // Shake rotation. This works fine       
    Matrix shakeRotation = Matrix.CreateRotationZ(
        newShakeOffset.Z &gt; 0.01 ? newShakeOffset.Z / 20 : 0);

    // Projection is used in Draw/Render
    this.AddChange(() =&gt; { 
        this.Projection = translation * obliqueProjection * 
        orthographic * taper * shakeRotation; }); 

#_Reasoning and Flow_#
There are 3 layers of tile data. Each tile is defined by `IsSemiTransparent`. When a tile is `IsSemiTransparent`, it needs to be drawn after something not `IsSemiTransparent`. Tile data is stacked when loaded on a `SplattedTile` instance. So, even if layer one of tile data is empty, layer one of the `SplattedTile` will have tile data in the first layer, (given that at least one layer has tile data).  The reason is that the `Z-buffer` doesn&#39;t know what to blend with if they are drawn in order, since there might be no solid pixels behind it. 

The layers do NOT have a z value, individual tile data has. When it is a ground tile, it has `Priority = 0`. So tiles with the same `Priority` we be ordered on layer (draw order) and opaqueness (semi-transparent, after opaque). Tiles with different priority will be drawn according to their priority.

The first solid layer has no destination pixels, so I set it to `DestinationBlend.Zero`. It also doesn&#39;t need `AlphaBlending`, since there is nothing to alphablend with. The other layers (5, 2 solid, 3 transparent) might be drawn when there is already color data and need to blend accordingly.

Before iterating through the 6 passes, the `projection matrix` is set. When using no taper, this works. When using a taper, it doesn&#39;t.

#**The Problem**#
We want to mimic some more depth by applying the taper, using the some matrix. We tried several values but this is an example:

    new Matrix(1, 0, 0, 0,
               0, 1, 0, 0.1f,
               0, 0, 1, 0,
               0, 0, 0, 1);

The screen (everything with height value 0, all flat stuff) will be squeezed. The lower the y (higher on the screen), the more it&#39;s squeezed. This actually works, but now random black lines appear almost everywhere. It seems to exclude a few tiles, but I don&#39;t see what&#39;s the correlation. We think it might had something to do with interpolation or mipmaps. 

And here is an image to show you what I am talking about:
![Screenshot with lines](https://dl.dropbox.com/u/613990/ImageHost/3RA/StackOverflow/Screenshot_9-5-2011.png).

The tiles not affected seem to be static tiles NOT on the bottom layer. **However, transparent tiles on top of those show other graphical artifacts. They miss lines (so rows just get deleted).** I marked this text because I think it is a hint to what&#39;s happening. The **vertical** lines appear if I put the `mip mag and minfilter` to `Linear`.

Here is an image zoomed in (in game zoom), showing the artifact on tiles on layer 2 or 3
![Screenshot with lines, zoomed in](https://dl.dropbox.com/u/613990/ImageHost/3RA/StackOverflow/Screenshot_10-5-20111.png)

#**We already tried**#
* `mipfilter` on `Point` or `Linear`  
* Setting `GenerateMipMaps` on the original textures  
* Setting `GenerateMipMaps` on the generated textures (true flag constructor of `RenderTarget`)  
* Turning on mipmapping (only gave more artifacts when zoomed out, because I was [mipmapping a spritesheet](http://blogs.msdn.com/b/shawnhar/archive/2009/09/08/texture-filtering.aspx).
* Not drawing layer 2 and 3 (this actually makes ALL the tiles have black lines)  
* `DepthBufferEnable = false`  
* Setting all solid layers to `SrcBlend = One;` `DestBlend = Zero;`
* Setting all solid layers to `ScrBlend = SrcAlpha;` `DestBlend = InvSrcAlpha;`
* Not drawing transparent layer (lines are still there).
* Removing `clip(opacity)` in the `shader`. This only removes some lines. We are investigating this further.
* Searching for the same problem on msdn, stackoverflow and using google (with no luck).

Does anyone recognize this problem? On a final note, we do call the `SpriteBatch` AFTER drawing the tiles, and use another `Shader` for avatars (show no problems, because they have height &gt; 0). Does this undo our `sampler state`? Or...?

When transforming textures (drawn as flat 3D objects) to mimic depth, black lines appear randomly

I just committed some changes into one of my feature branches (&quot;feedback_tab&quot;) then, checked out &quot;master&quot; and merged them in there.  I actually meant to merge them into my &quot;development&quot; branch.

Now, master is ahead of &#39;origin/master&#39; (its remote) by 17 commits - I haven&#39;t pushed the merge up (and don&#39;t want to, obviously).  How can I revert master back to the same state as before the accidental merge?  I&#39;m confused between `git revert` and `git reset` with this stuff.

I looked in my git log and there&#39;s no entry for merging feedback_tab into master.  I&#39;d have thought it would be the top entry?

Bit confused :/ any help welcome!  max



Undo a git merge (hasn&#39;t been pushed yet)

I just committed some changes into one of my feature branches ("feedback_tab") then, checked out "master" and merged them in there. I actually meant to merge them into my "development" branch.
Now, master is ahead of 'origin/master' (its remote) by 17 commits - I haven't pushed the merge up (and don't want to, obviously). How can I revert master back to the same state as before the accidental merge? I'm confused between <code>git revert</code> and <code>git reset</code> with this stuff.
I looked in my git log and there's no entry for merging feedback_tab into master. I'd have thought it would be the top entry?
Bit confused :/ any help welcome! max

I&#39;m looking for an implementation of git which is accessible from nodejs - does such a beast exist?

Has anyone implemented a git clone or interface library using nodejs?

I don&#39;t get the difference between `git rebase origin` and `git rebase origin/master`. In my case I cloned a git repository twice. In the first clone I have to use `git rebase origin` and in the other clone I must use `git rebase origin/master`.

An example: http://paste.dennis-boldt.de/2011/05/11/git-rebase

&quot;git rebase origin&quot; vs.&quot;git rebase origin/master&quot;

I&#39;ve been working on a project, but unfortunately, I *forgot* to switch to my branch, and as such have been working on master

How can I copy the work (3 files) I&#39;ve done here from master, to my branch (called, for example *branch123*) without comitting to master?

Git - working on wrong branch - how to copy changes to existing topic branch

I have a slight annoyance with my heroku push/deploy process, which otherwise has been a joy to discover and use.  

If i add a new migration to my app, the only way i can get it up onto the heroku server is to do a push to the heroku remote.  This uploads it and restarts the app.  But it doesn&#39;t run the migration, so i have to do `heroku rake db:migrate --app myapp`, then `heroku restart --app myapp`.  In the meantime, the app is broken because it hasn&#39;t run the migrations and the code is referring to fields/tables etc in the migration.

There must be a way to change the deployment process to run the `rake db:migrate` automatically as part of the deploy process but i can&#39;t work it out.  

Is it something i set in a heroku cpanel?  Is it an option i pass to heroku from the command line?  Is it a git hook?  Can anyone set me straight?  thanks, max

Rails 3 and Heroku: automatically &quot;rake db:migrate&quot; on push?

I&#39;m using git, and made a small commit followed by a large one.  I decided to use `git rebase` to squash the two commits together before pushing them.  (I&#39;ve never done this before.)

So I did:

`git rebase -i HEAD~2`

This gave me my editor, where I chose to pick the earlier commit and squash the later one.  When I saved, git said:

&gt; error: cannot stat &#39;*filename*&#39;: Permission denied
&gt;
&gt; Could not apply *sha1 for later commit*... *initial line of text for that commit*

Now:

* Neither commit appears when I do `git log`.
* `git status` tells me I&#39;m &quot;Not currently on any branch.&quot;
* One file is listed as modified and in the index, and two files are listed as untracked.  My first commit had just one file (I think), and my second commit had a good dozen.

What happened!?  How do I fix it?

git rebase: &quot;error: cannot stat &#39;file&#39;: Permission denied&quot;

I have two data.frames, one with only characters and the other one with characters and values.

    df1 = data.frame(x=c(&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;, &#39;e&#39;))
    df2 = data.frame(x=c(&#39;a&#39;, &#39;b&#39;, &#39;c&#39;),y = c(0,1,0))
    merge(df1, df2)
      x y
    1 a 0
    2 b 1
    3 c 0 

I want to merge df1 and df2. The characters a, b and c merged good and also have 0, 1, 0 but d and e has nothing. I want d and e also in the merge table, with the 0 0 condition. Thus for every missing row at the df2 data.frame, the 0 must be placed in the df1 table, like:


      x y
    1 a 0
    2 b 1
    3 c 0
    4 d 0
    5 e 0

Merge unequal dataframes and replace missing rows with 0

Well i&#39;m trying to merge multiple PDFs in to one.

I gives no errors while compiling. I tried to merge the docs first but that went wrong because I&#39;m working with tables.


This is the **asp.net code-behind**


    if (Button.Equals(&quot;PreviewWord&quot;)) {
     
            String eventTemplate = Server.MapPath(&quot;/ERAS/Badges/Template/EventTemp&quot; + EventName + &quot;.doc&quot;);

            String SinglePreview = Server.MapPath(&quot;/ERAS/Badges/Template/PreviewSingle&quot; + EventName + &quot;.doc&quot;);

            String PDFPreview = Server.MapPath(&quot;/ERAS/Badges/Template/PDFPreviewSingle&quot; + EventName + &quot;.pdf&quot;);

            String previewPDFs = Server.MapPath(&quot;/ERAS/Badges/Template/PreviewPDFs&quot; + EventName + &quot;.pdf&quot;);

            if (System.IO.File.Exists((String)eventTemplate))
            {
                
                if (vulGegevensIn == true)
                {
                  //This creates a Worddocument and fills in names etc from database
                    CreateWordDocument(vulGegevensIn, eventTemplate, SinglePreview, false);
                    //This saves the SinglePreview.doc as a PDF @param place of PDFPreview
                    CreatePDF(SinglePreview, PDFPreview);
                   

                    //Trying to merge
                    String[] previewsSmall=new String[1];
                    previewsSmall[0] = PDFPreview;
                    PDFMergenITextSharp.MergeFiles(previewPDFs, previewsSmall);
                }


                // merge PDFs here...........................;
                //here
                //no here//
                //...

               
        } }

**This is the PDFMergenITextSharpClass**

public static class PDFMergenITextSharp
{

    public static void MergeFiles(string destinationFile, string[] sourceFiles)
    {

        try
        {
            int f = 0;
            // we create a reader for a certain document
            PdfReader reader = new PdfReader(sourceFiles[f]);
            // we retrieve the total number of pages
            int n = reader.NumberOfPages;
            //Console.WriteLine(&quot;There are &quot; + n + &quot; pages in the original file.&quot;);
            // step 1: creation of a document-object
            Document document = new Document(reader.GetPageSizeWithRotation(1));
            // step 2: we create a writer that listens to the document
            PdfWriter writer = PdfWriter.GetInstance(document, new FileStream(destinationFile, FileMode.Create));
            // step 3: we open the document
            document.Open();
            PdfContentByte cb = writer.DirectContent;
            PdfImportedPage page;
            int rotation;
            // step 4: we add content
            while (f &lt; sourceFiles.Length)
            {
                int i = 0;
                while (i &lt; n)
                {
                    i++;
                    document.SetPageSize(reader.GetPageSizeWithRotation(i));
                    document.NewPage();
                    page = writer.GetImportedPage(reader, i);
                    rotation = reader.GetPageRotation(i);
                    if (rotation == 90 || rotation == 270)
                    {
                        cb.AddTemplate(page, 0, -1f, 1f, 0, 0, reader.GetPageSizeWithRotation(i).Height);
                    }
                    else
                    {
                        cb.AddTemplate(page, 1f, 0, 0, 1f, 0, 0);
                    }
                    //Console.WriteLine(&quot;Processed page &quot; + i);
                }
                f++;
                if (f &lt; sourceFiles.Length)
                {
                    reader = new PdfReader(sourceFiles[f]);
                    // we retrieve the total number of pages
                    n = reader.NumberOfPages;
                    //Console.WriteLine(&quot;There are &quot; + n + &quot; pages in the original file.&quot;);
                }
            }
            // step 5: we close the document
            document.Close();
        }
        catch (Exception e)
        {
            string strOb = e.Message;
        }
    }

    public static int CountPageNo(string strFileName)
    {
        // we create a reader for a certain document
        PdfReader reader = new PdfReader(strFileName);
        // we retrieve the total number of pages
        return reader.NumberOfPages;
    }
    }

Merging multiple PDFs using iTextSharp in c#.net

In the example below I have two datasets (Z and A). I want to merge or combine these sets by the ILMN numbers. If there is no match, fill in NA. 

    z &lt;- matrix(c(0,0,1,1,0,0,1,1,0,0,0,0,1,0,1,1,0,1,1,1,1,0,0,0,&quot;RND1&quot;,&quot;WDR&quot;, &quot;PLAC8&quot;,&quot;TYBSA&quot;,&quot;GRA&quot;,&quot;TAF&quot;), nrow=6,
        dimnames=list(c(&quot;ILMN_1651838&quot;,&quot;ILMN_1652371&quot;,&quot;ILMN_1652464&quot;,&quot;ILMN_1652952&quot;,&quot;ILMN_1653026&quot;,&quot;ILMN_1653103&quot;),c(&quot;A&quot;,&quot;B&quot;,&quot;C&quot;,&quot;D&quot;,&quot;symbol&quot;)))

    t&lt;-matrix(c(&quot;GO:0002009&quot;, 8, 342, 1, 0.07, 0.679, 0, 0, 1, 0, 
            &quot;GO:0030334&quot;, 6, 343, 1, 0.07, 0.065, 0, 0, 1, 0,
            &quot;GO:0015674&quot;, 7, 350, 1, 0.07, 0.065, 1, 0, 0, 0), nrow=10, dimnames= list(c(&quot;GO.ID&quot;,&quot;LEVEL&quot;,&quot;Annotated&quot;,&quot;Significant&quot;,&quot;Expected&quot;,&quot;resultFisher&quot;,&quot;ILMN_1652464&quot;,&quot;ILMN_1651838&quot;,&quot;ILMN_1711311&quot;,&quot;ILMN_1653026&quot;)))

The result will be like this:

                 [,1]         [,2]         [,3]         [,4]
    GO.ID        &quot;GO:0002009&quot; &quot;GO:0030334&quot; &quot;GO:0015674&quot;  NA
    LEVEL        &quot;8&quot;          &quot;6&quot;          &quot;7&quot;           NA
    Annotated    &quot;342&quot;        &quot;343&quot;        &quot;350&quot;         NA
    Significant  &quot;1&quot;          &quot;1&quot;          &quot;1&quot;           NA
    Expected     &quot;0.07&quot;       &quot;0.07&quot;       &quot;0.07&quot;        NA
    resultFisher &quot;0.679&quot;      &quot;0.065&quot;      &quot;0.065&quot;       NA
    ILMN_1652464 &quot;0&quot;          &quot;0&quot;          &quot;1&quot;           PLAC8
    ILMN_1651838 &quot;0&quot;          &quot;0&quot;          &quot;0&quot;           RND1
    ILMN_1711311 &quot;1&quot;          &quot;1&quot;          &quot;0&quot;           NA
    ILMN_1653026 &quot;0&quot;          &quot;0&quot;          &quot;0&quot;           GRA

Merge or combine by rownames

Stack Overflow question *[How and/or why is merging in Git better than in SVN?][1]* is a great question with some **great answers**. However none of them show a simple example where merging in Git works better than [SVN][2].

On the chance this question will be closed as a duplicate, what is

 1. A concrete merge scenario
 2. How it is difficult in SVN?
 3. How the same merge is easier in Git?

A few points:

 - No philosophy or deep explanations of what a DVCS is please. These are great, really, but I don&#39;t want their details to obfuscate the answer to this (IMHO) important
 - I don&#39;t care about &quot;historic SVN&quot; at the moment. Please compare modern Git (1.7.5) to modern SVN (1.6.15).
 - No renames please - I know that Git detects renames and moves, while SVN doesn&#39;t. This is great, but I am looking for something deeper, and example that doesn&#39;t involve renames or moves.
 - No rebase or other &#39;advanced&#39; Git operation. Just show me the merge please.

  [1]: https://stackoverflow.com/questions/2471606/how-and-or-why-is-merging-in-git-better-than-in-svn
  [2]: http://en.wikipedia.org/wiki/Apache_Subversion


Really, a concrete example that merging in Git is easier than SVN?

I have the following situation:

- I created a `clone`(Y) from a main repository(X), because there were many people working on Y we didn&#39;t do any `rebase` but only `merge`s. When we want to deliver(`push`) Y to X we would like to do a `rebase` in order to have things nice and clean

The problem is that when doing `rebase` we are asked to do all the merges that we already did in the previous `merge` steps. Is there a solution to this, beside the one that means actually re-doing the merges? 

I expected it to be pretty straightforward since we already solved the conflicting merges.


git rebase after previous git merge

I have a repo that has two files that supposedly I changed locally.

So I&#39;m stuck with this:

    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   dir1/foo.aspx
    #       modified:   dir2/foo.aspx
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

Doing `git diff` says that the entire file contents have changed, even though from eyeballing it that seems untrue (there seem to be common line ranges that diff seems to be failing to see).

Interestingly I don&#39;t remember changing these files locally. This repo is used with one remote repo (private, at GitHub.com, FWIW).

No matter what I&#39;ve tried, I can&#39;t discard these local changes. I have tried all of:

    $ git checkout -- .
    $ git checkout -f
    $ git checkout -- dir1/checkout_receipt.aspx
    $ git reset --hard HEAD
    $ git stash save --keep-index &amp;&amp; git stash drop
    $ git checkout-index -a -f

In other words I&#39;ve tried everything described in https://stackoverflow.com/questions/52704/how-do-you-discard-unstaged-changes-in-git plus more. But the 2 files remain stuck as &quot;changed but not committed&quot;.

What the heck would cause two files to be stuck like this and seemingly &quot;un-revert-table&quot;??

P.S. In the list above showing commands I&#39;d already tried, I mistakenly wrote `git revert` when I meant `git checkout`. I&#39;m sorry and thank you to those of you who answered that I should try `checkout`. I edited the question to correct it. I definitely did already try `checkout`.

Git: How to revert 2 files that are stubbornly stuck at &quot;Changed but not committed&quot;?

how do i revert all my files on my local copy back to a certain commit?


    commit 4a155e5b3b4548f5f8139b5210b9bb477fa549de
    Author: John Doe &lt;Doe.John.10@gmail.com&gt;
    Date:   Thu Jul 21 20:51:38 2011 -0500


This is the commit i&#39;d like to revert back to. any help would be a lifesaver!



git revert back to certain commit

Given a change that has been committed using `commit`, and then reverted using `revert`, what is the best way to then undo that revert?

Ideally, this should be done with a new commit, so as to not re-write history.

How do I &quot;un-revert&quot; a reverted Git commit?

This is not a major problem, just something I want to know whether or not is possible.

Let&#39;s say we have two commits, `abcd123` and `wxyz789`, that occur at non-adjacent, separate places, far back in a repo&#39;s history.  Now let&#39;s say we want to revert them.  Doing

    git revert abcd123 wxyz789

would result in two separate commits, one reverting `abcd123` and the other reverting ` wxyz789`.

This is all fine and well, but what if the mistakes we want to fix in the two commits are logically linked, and for the purposes of self-documentation we&#39;d like to make one single commit containing one single &quot;*I broke something so now I&#39;m reverting files x, y and z*&quot; comment?  Is there a git command that does this?

(I am of course aware that it is possible to create a commit where I just manually fix all the changes and then push.  This is painful for all the obbious reasons.)

How to revert multiple commits as part of a single commit

I have found various examples of how to revert an SVN commit like

    svn merge -r [current_version]:[previous_version] [repository_url]

or

    svn merge -c -[R] .

But neither of them seems to work. I tried those commands and checked the files that were changed by hand.

How do I revert a commit with revision number 1944? How do I check that the revert has been done (without looking in the actual file to the changes have been reverted)?


Content Type	Original Author	Original Content on Stackoverflow
Question	Max Williams	View Question on Stackoverflow
Solution 1 - Git	Hemerson Varela	View Answer on Stackoverflow
Solution 2 - Git	Tamás	View Answer on Stackoverflow
Solution 3 - Git	Amir Raminfar	View Answer on Stackoverflow
Solution 4 - Git	Alon Kogan	View Answer on Stackoverflow

Undo a git merge (hasn't been pushed yet)

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

When transforming textures (drawn as flat 3D objects) to mimic depth, black lines appear randomly

Basic HTTP authentication in Node.JS?

Attributions