You have already performed a filter-branch operation. After filter-branch, Git keeps refs to the old commits around, in case something goes wrong. 

You can find those in `.git/refs/original/…`. Either delete that directory and all files within, or use the `-f` flag to force Git to delete the old references.

    git filter-branch -f \
    --index-filter &#39;git rm --cached --ignore-unmatch Rakefile&#39; HEAD

Use this command to remove original backup:

    git update-ref -d refs/original/refs/heads/master

Here is gist I used to filter-branch my git repo:  https://gist.github.com/k06a/25a0214c98bc19fd6817

I had the same problem and the answer above didn&#39;t fix it.  There was no .git/refs/original/ directory left.  The solution for me was to delete the  .git/packed-refs file.  

Add a force to the filter branch command. 

My webpage has a &#39;skinny&#39; list: for example, a list of 100 items of one word in length each. To reduce scrolling, I want to present this list in two or even four columns on the page. How should I do this with CSS?

&lt;!-- begin snippet: js hide: false --&gt;

&lt;!-- language: lang-html --&gt;

    &lt;ul&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
        &lt;li&gt;Item&lt;/li&gt;
    &lt;/ul&gt;

&lt;!-- end snippet --&gt;

I prefer the solution to be flexible so that if the list grows to 200 items, I don&#39;t have to do a lot of manual adjustments to accommodate the new list.

Is there a way to break a list into columns?

Is anyone aware of a pure, Javascript based implementation of the directional flow diagrams that GraphViz is capable of generating? I am NOT interested in pretty visuals output, but the computations to figure out the maximum depth of each node, along with the layout of bezier lines that are optimized to minimize the number of intersecting edges when you are dealing with a graph rather than a tree of information.  I would like to run this code both within a browser; I am aware that I could easily embed Graphviz into my Node server as an extension, or even `popen()` it and stream over graph information in the `.dot` format.

For reference, here is a typical GraphViz output. Note how elements are stacked and spaced out to allow the connecting lines to travel between nodes, without intersecting (very often) or passing through nodes.

![enter image description here][1]


  [1]: http://i.stack.imgur.com/5ZlBN.png

Pure JavaScript Graphviz equivalent 

I tried to remove a file from my remote repo by running:

    git filter-branch --index-filter &#39;git rm --cached --ignore-unmatch Rakefile&#39; HEAD

But Git complains that 

&gt; Cannot create new backup. A previous backup already exists in refs/original/  
Force overwriting the backup with -f  
rm: cannot remove /.git-rewrite/backup-refs : Permission denied    
rm: cannot remove directory /.git-rewrite : Directory not empty

This was after I already deleted the .git-rewrite directory on Windows.

How can I remove that file? It&#39;s a 29Mb file sitting on my repo, so I quite need to remove the file. 

I tried to delete the commit in `git rebase -i`, but apparently because the commit touched a lot of different files, Git complains of conflicts and I aborted to be safe.

Purging file from Git repo failed, unable to create new backup

I tried to remove a file from my remote repo by running:
<pre><code class="hljs language-css">git filter-branch --index-filter 'git rm --cached --ignore-unmatch Rakefile' HEAD
</code></pre>
But Git complains that
> Cannot create new backup. A previous backup already exists in refs/original/ 
Force overwriting the backup with -f 
rm: cannot remove /.git-rewrite/backup-refs : Permission denied 
rm: cannot remove directory /.git-rewrite : Directory not empty
This was after I already deleted the .git-rewrite directory on Windows.
How can I remove that file? It's a 29Mb file sitting on my repo, so I quite need to remove the file.
I tried to delete the commit in <code>git rebase -i</code>, but apparently because the commit touched a lot of different files, Git complains of conflicts and I aborted to be safe.

I&#39;m the only one in my organization who&#39;s making commits with the following message:

&gt; Merge remote-tracking branch &#39;origin/develop&#39; into develop 

Not sure what I&#39;m doing to cause them, but I&#39;d like to stop.

What command am I issuing to create this commit, and what is the proper command I ought to be using to not produce it?


Why am I merging &quot;remote-tracking branch &#39;origin/develop&#39; into develop&quot;?

How do I configure Git to use a different tool for diffing with the .gitconfig file?

I have this in my .gitconfig:

    [diff]
        tool = git-chdiff #also tried /bin/git-chdiff

It does not work; it just opens the regular command line diff. When I do

    export GIT_EXTERNAL_DIFF=git-chdiff

then `git diff` will open up the external diffing tool (so I know the external diff tool script works fine). Do I have something wrong with my .gitconfig configuration for the diff tool?



Configuring diff tool with .gitconfig

I&#39;d like to merge a remote git repository in my working git repository as a subdirectory of it. I&#39;d like the resulting repository to contain the merged history of the two repositories and also that each file of the merged-in repository retain its history as it was in the remote repository. I tried using the subtree strategy as mentioned in [How to use the subtree merge strategy](http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html), but after following that procedure, although the resulting repository contains indeed the merged history of the two repositories, individual files coming from the remote one haven&#39;t retained their history (`git log&#39; on any of them just shows a message &quot;Merged branch...&quot;).

Also I don&#39;t want to use submodules because I do not want the two combined git repositories to be separate anymore.

Is it possible to merge a remote git repository in another one as a subdirectory with individual files coming from the remote repository retaining their history?

Thanks very much for any help.

EDIT:
I&#39;m currently trying out a solution that uses git filter-branch to rewrite the merged-in repository history. It does seem to work, but I need to test it some more. I&#39;ll return to report on my findings.

EDIT 2:
In hope I make myself more clear I give the exact commands I used with git&#39;s subtree strategy, which result in apparent loss of history of the files of the remote repository.
Let A be the git repo I&#39;m currently working in and B the git repo I&#39;d like to incorporate into A as a subdirectory of it. It did the following:

    git remote add -f B &lt;url-of-B&gt;
    git merge -s ours --no-commit B/master
    git read-tree --prefix=subdir/Iwant/to/put/B/in/ -u B/master
    git commit -m &quot;Merge B as subdirectory in subdir/Iwant/to/put/B/in.&quot;

After these commands and going into directory subdir/Iwant/to/put/B/in, I see all files of B, but `git log` on any one of them shows just  the commit message &quot;Merge B as subdirectory in subdir/Iwant/to/put/B/in.&quot; Their file history as it is in B is lost.

What *seems* to work (since I&#39;m a beginner on git I may be wrong) is the following:

    git remote add -f B &lt;url-of-B&gt;
    git checkout -b B_branch B/master  # make a local branch following B&#39;s master
    git filter-branch --index-filter \ 
       &#39;git ls-files -s | sed &quot;s-\t\&quot;*-&amp;subdir/Iwant/to/put/B/in/-&quot; |
            GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
                    git update-index --index-info &amp;&amp;
            mv &quot;$GIT_INDEX_FILE.new&quot; &quot;$GIT_INDEX_FILE&quot;&#39; HEAD 
    git checkout master
    git merge B_branch

The command above for filter-branch is taken from `git help filter-branch`, in which I only changed the subdir path.

Merge git repository in subdirectory

I **love** *git add --interactive*. It is now part of my daily workflow.

The problem seems that it does not work with untracked files. What I want to do is track a new file, but only add part of it, i.e. some parts of this new file are not yet ready to be staged. 

For example, with git add -i, I can chose the patch option and even edit individual hunks in order to stage parts of the new code, leaving debug code comments unstaged. I love working this way because it makes it obvious which places of the mega patch I am currently working on still need work.

Unfortunately, I don&#39;t seem to be able to do the same with an untracked file. Either I stage the whole file, or nothing. The workaround I have been using is staging or even committing a new file when it is empty, and then staging individual changes in the usual way. But this solution feels like a dirty hack and when I forget, or change my mind, it creates more troubles than there should be.

So the question is: How to stage only part of a new file, so that this new file gets tracked but leaving the whole or parts of its content unstaged?


How to stage only part of a new file with git?

I&#39;ve pushed a commit and I want to revert changes introduced by this commit by applying and committing a reversed patch. How do I do it? 

Undo a Git commit after push using reverse patch?

I have performed `git commit` followed by a `git push`.  How can I revert that change on both local and remote repositories?

    $ git log
    commit 364705c23011b0fc6a7ca2d80c86cef4a7c4db7ac8
    Author: Michael Silver &lt;Michael Silver@gmail.com&gt;
    Date:   Tue Jun 11 12:24:23 2011 -0700

How can I undo a `git commit` locally and on a remote after `git push`

I&#39;m looking at a git hook which looks for print statements in Python code.  If a print statement is found, it prevents the git commit. 

I want to override this hook and I was told that there is a command to do so.  I haven&#39;t been able to find it.  Any thoughts?

Skip Git commit hooks

I have two projects. One is the &quot;official&quot; project and the second is a light modification (some files added). I created new branch and I put new files to them. But in during development some files common to both branches is changed.

How do I commit only these files?


How do I commit only some files?

I am trying to recover my work. I stupidly did `git reset --hard`, but before that I&#39;ve done only `get add .` and didn&#39;t do `git commit`. Please help! Here is my log:

    MacBookPro:api user$ git status
    # On branch master
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    
    #   modified:   .gitignore
    ...


    MacBookPro:api user$ git reset --hard
    HEAD is now at ff546fa added new strucuture for api

Is it possible to undo `git reset --hard` in this situation?

Undo git reset --hard with uncommitted files in the staging area

I did a `git commit -m &quot;message&quot;` like this:

    &gt; git commit -m &quot;save arezzo files&quot;
    # On branch master
    # Changes not staged for commit:
    #   (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:   arezzo.txt
    #       modified:   arezzo.jsp
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

But afterwards, when I do `git status` it shows the same modified files:

    &gt; git status
    # On branch master
    # Changes not staged for commit:
    #   (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:   arezzo.txt
    #       modified:   arezzo.jsp
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

What am I doing wrong?


Why does &#39;git commit&#39; not save my changes?

I have a Git repo converted from SVN to Mercurial to Git, and I wanted to extract just one source file. I also had weird characters like `a&#204;` (an encoding mismatch corrupted Unicode `&#228;`) and spaces in the filenames.

How can I extract one file from a repository and place it at the root of the new repo?

How to extract one file with commit history from a Git repo with index-filter &amp; co?

I&#39;m using the following sources to expunge some large files and directories from my repository:

http://dound.com/2009/04/git-forever-remove-files-or-folders-from-history/

https://stackoverflow.com/questions/1029969/why-is-my-git-repository-so-big/1036595#1036595


`git filter-branch` only seems to work on the current branch - is there a way to apply it to all branches at once?

git, filter-branch on all branches

    git filter-branch --env-filter &#39;
    export GIT_AUTHOR_EMAIL=&quot;foo@example.com&quot;
    export GIT_AUTHOR_NAME=&quot;foo&quot;&#39; -- commita..commitb

Results in `Which ref do you want to rewrite?`

So it seems that `filter-branch` doesn&#39;t allow you to &lt;s&gt;use range notation&lt;/s&gt; use a range between two arbitrary refs.

What is the most straight forward way of running a filter over a range of consecutive commits (somewhere within the history of a branch) if this approach isn&#39;t possible.

Running filter-branch over a range of commits

I  added over 9000 photos by accident to my project folder. And committed them. Then deleted them from disk. Committed. 

Now I try to push changes to git server. But it takes too long and tries to send 12 Gb of data. 

I checked files size on disk and see that really `.git` folder takes 12 Gb. 

**How to delete photos** from there? I tried `git rm`, but fails:

    ❯ git rm public/photos
    fatal: pathspec &#39;public/photos&#39; did not match any files

Because I allready deleted them from disk, but they are still in `.git` folder. 

I tried to add `public/photos` to `.gitignore`:

    public/photos/
    *.zip

But no result.
Of course I could `hard reset head` to moment when I did not have so many junk photos in my project. But since that time i committed many times and made a lot changes in code.  

git rm - fatal: pathspec did not match any files

I had the same question as asked here: https://stackoverflow.com/questions/7193507/new-git-repository-in-root-directory-to-subsume-an-exist-repository-in-a-sub-dire

I followed this answer here: https://stackoverflow.com/questions/7193507/new-git-repository-in-root-directory-to-subsume-an-exist-repository-in-a-sub-dire/7194124#7194124

Now, `gitk --all` shows two histories: one culminating in the current `master`, and one named `original/refs/heads/master`.

I don&#39;t know what this second history is, or how to remove it from the repo. I don&#39;t need two histories in my repository.

How do I get rid of it?

To reproduce yourself:

    mkdir -p project-root/path/to/module
    cd project-root/path/to/module
    mkdir dir1 dir2 dir3 
    for dir in * ; do touch $dir/source-file-$dir.py ; done
    git init
    git add .
    git commit -m &#39;Initial commit&#39;
    
Now we have the original poster&#39;s problem. Let&#39;s move the root of the git repo to project-root using the answer linked above:

    git filter-branch --tree-filter &#39;mkdir -p path/to/module ; git mv dir1 dir2 dir3 path/to/module&#39; HEAD
    rm -rf path
    cd ../../../ # Now PWD is project-root
    mv path/to/module/.git .
    git reset --hard

Now, see my current problem:

    gitk --all &amp;
    git show-ref

How do I get rid of `refs/original/heads/master` and all associated history?

Remove refs/original/heads/master from git repo after filter-branch --tree-filter?

&gt; **Possible Duplicate:**  
&gt; [How to purge a huge file from commits history in Git?](https://stackoverflow.com/questions/2100907/how-to-purge-a-huge-file-from-commits-history-in-git)  

&lt;!-- End of automatically inserted text --&gt;

I did a stupid thing. Imagine that I committed a 100MB file. Then I see this and delete this file and commit again. This is a normal procedure to delete a file. 

But now the side effect is that my history is heavy because it&#39;s saved this large file (I believe this is why it is heavy). I am only using local git, so I do not synchronize in any server.

How can I definitively remove this file and save disk space?

How do I remove a big file wrongly committed in git

I have made 3 git commits, but have not been pushed.
How can I amend the older one (ddc6859af44) and (47175e84c) which is not the most recent one?

    $git log
    commit f4074f289b8a49250b15a4f25ca4b46017454781
    Date:   Tue Jan 10 10:57:27 2012 -0800
    
    commit ddc6859af448b8fd2e86dd0437c47b6014380a7f
    Date:   Mon Jan 9 16:29:30 2012 -0800
    
    commit 47175e84c2cb7e47520f7dde824718eae3624550
    Date:   Mon Jan 9 13:13:22 2012 -0800

How to amend older Git commit?

What&#39;s the difference between `edit` and `reword` when you do a git rebase?

I&#39;m going through some docs which say this:

    Replace pick with:
    - edit to mark a commit for amending.
    - reword to change the log message.



Content Type	Original Author	Original Content on Stackoverflow
Question	Cardin	View Question on Stackoverflow
Solution 1 - Git	knittl	View Answer on Stackoverflow
Solution 2 - Git	k06a	View Answer on Stackoverflow
Solution 3 - Git	Yaron	View Answer on Stackoverflow
Solution 4 - Git	Adam Dymitruk	View Answer on Stackoverflow

Purging file from Git repo failed, unable to create new backup

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Pure JavaScript Graphviz equivalent

Is there a way to break a list into columns?

Attributions