Put this in $HOME/.gitconfig:

    [merge]
        ff = no
        commit = no

You can use git-config to do this:

      git config --global merge.commit no
      git config --global merge.ff no

To make `--no-ff --no-commit` the default merge behavior, set the options to `no` using:

    git config --global merge.ff no
    git config --global merge.commit no


However, the problem with this is that `git pull` = `git fetch` + `git merge`. So whenever you pull from the remote server, you&#39;d be creating an ugly merge commit when a simple fast-forward would be warranted. To solve this, set `pull.ff` to `yes`:

    git config --global pull.ff yes


As of version 1.7.6 of git, you should use

    git config [--global] merge.ff no

to &quot;force&quot; using `--no-ff` in every merge.

Default behaviour is
 
    git config [--global] merge.ff yes

And with

    git config [--global] merge.ff only

it will refuse non-fast-forward merges



According to [manual](http://www.kernel.org/pub/software/scm/git/docs/git-config.html), you should use

    $ git config [--global] merge.ff false

to set no-fast-forward option by default for all branches with git-config utility.

How can I export tables to Excel from a webpage. I want the export to contain all the formatting and colours.

How can I export tables to Excel from a webpage

I am using jquery in my web application and I need to load more jquery script files into a single page.

Google suggested I combine all the jquery script files into a single file.

How can I do this?

Combine multiple JavaScript files into one JS file

Company policy is to use `--no-ff` for merge commits. I personally like to adjust merge log messages so I use `--no-commit`. Plus I like to actually compile and test before I let the commit go.

How do I make `--no-ff` and `--no-commit` the default for me for all branches?

(and I&#39;ve learned in the years since asking this, I almost always am happy with the commit, so it is simpler to allow it to commit by default and so long as I amend or otherwise fix things up before doing a push things are all good...)


How do I make git merge&#39;s default be --no-ff --no-commit?

Company policy is to use <code>--no-ff</code> for merge commits. I personally like to adjust merge log messages so I use <code>--no-commit</code>. Plus I like to actually compile and test before I let the commit go.
How do I make <code>--no-ff</code> and <code>--no-commit</code> the default for me for all branches?
(and I've learned in the years since asking this, I almost always am happy with the commit, so it is simpler to allow it to commit by default and so long as I amend or otherwise fix things up before doing a push things are all good...)

I&#39;ve read various things about git&#39;s `rerere` feature, and I&#39;m considering enabling it.

 &gt; The `git rerere` functionality is a bit of a hidden feature. The name stands for **“reuse recorded resolution”** and, as the name implies, it allows you to ask Git to remember how you’ve resolved a hunk conflict so that the next time it sees the same conflict, Git can resolve it for you automatically.
 &gt;
 &gt; https://git-scm.com/book/en/v2/Git-Tools-Rerere



But I haven&#39;t seen anyone mention any possible problems that could arise while using `rerere`.

I have to assume there is a downside, or it would probably be enabled by default. So is there any downside to enabling rerere? What potential problems can it cause that would not otherwise occur?

Are there any downsides to enabling git rerere?

I&#39;m really new to git and I&#39;ve been trying to understand why git keeps showing whatever I changed in one branch in another branch when I run git checkout to switch between branches First I tried not using git add and didn&#39;t work. However, I tried then using git add, but didn&#39;t fix the problem. I&#39;m not using git commit yet.

This is basically what I&#39;m doing:

    $ git clone &lt;a_repository&gt;  
    $ git branch  
    * master  
    $ git branch testing  
    $ git checkout testing  
    ...edit a file, add a new one, delete...  
    $ git status  
        # On branch testing  
        # Changed but not updated:  
        #   (use &quot;git add/rm &lt;file&gt;...&quot; to update what will be committed)  
        #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)  
        #  
        #       deleted:    file1.txt  
        #  
        # Untracked files:  
        #   (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)  
        #  
        #       file2.txt  
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)  
    $ git branch  
      master  
    * testing  
    $ git checkout master  
    D       file1.txt  
    Switched to branch &#39;master&#39;  
    $ git status  
        # On branch master  
        # Changed but not updated:  
        #   (use &quot;git add/rm &lt;file&gt;...&quot; to update what will be committed)  
        #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)  
        #  
        #       deleted:    file1.txt  
        #  
        # Untracked files:  
        #   (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)  
        #  
        #       file2.txt  
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)  
      

I thought that, while using branches, whatever you do in one branch, it&#39;s invisible to all the other branches. Is not that the reason of creating branches?

I tried using &quot;git add&quot; but the changes are visible in both branches. 
Do I need to run &quot;git commit&quot; before switching between branches to avoid this? 

Why git keeps showing my changes when I switch branches (modified,added, deleted files) no matter if I run git add or not?

What changes do I need to make to the `deploy.rb` file below to make it deploy my app from a local git repo? If I can&#39;t deploy from a local repo, can I have capistrano use the working copying instead?

    set :application, &quot;my_app&quot;
    set :repository, &quot;.&quot;
    set :local_repository, &quot;file:///path/to/application/.git&quot;
    set :deploy_to, &quot;/data/www/apps/#{application}&quot;
    set :deploy_via, :copy
    set :copy_cache, true
    set :user, &quot;dane&quot;
    set :use_sudo, false
    
    set :scm, :git # Should I change this to :none
    set :branch, &quot;master&quot;

How to Configure Capistrano to Deploy from Local Git Repository?

I have the folder `application/` which I add to the `.gitignore`. Inside the  `application/` folder is the folder `application/language/gr`. How can I include this folder?

I&#39;ve tried this

    application/
    !application/language/gr/





.gitignore exclude folder but include specific subfolder

I&#39;ve been reading about the bare and non-bare / default repositories in Git. I haven&#39;t been able to understand quite well (theoretically) the differences between them, and why I should &quot;push&quot; to a bare repository. Here&#39;s the deal:

Currently, I&#39;m the only one working on a project on 3 different computers, but there will be more people involved in it later, so I&#39;m using Git for the version control. I clone the bare repo on all computers, and when I finish my modifications on one of them, I commit and push the changes to the bare repo. From what I&#39;ve read, the bare repository does NOT have a &quot;working tree&quot;, so if I clone the bare repo, I won&#39;t have a &quot;working tree&quot;.

I&#39;m guessing that the working tree stores the commit information, branches, etc. from the project. That wouldn&#39;t appear in the bare repo. So it seems better for me to &quot;push&quot; the commits to the repo with the working tree.

Then, **why should I use the bare repository and why not? What&#39;s the practical difference?** That would not be beneficial to more people working on a project, I suppose.

What are your methods for this kind of work? Suggestions?

What&#39;s the -practical- difference between a Bare and non-Bare repository?

I&#39;m running into conflicts while trying to merge upstream changes back into my branch and I&#39;m not sure how to resolve them.

I created my own fork. I cloned it. I made changes to the branch on my fork, committed, and pushed. But then the main fork updated, and I tried to update my own fork by merging upstream in like so:

    $ cd repo-name
    $ git remote add upstream git://github.com/username/repo-name.git
    $ git fetch upstream
    $ git merge upstream/master

The merge says that there&#39;s some problem with a file and auto-merging doesn&#39;t work. It tells me to fix it myself and re-merge. So I actually went to the (upstream) repository on GitHub of the main fork and copied all the code of the new file into the file on my fork, and tried to merge again. Then, git gives me this error:

&gt; fatal: &#39;merge&#39; is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39; as
appropriate to mark resolution and make a commit, or use &#39;git commit -a&#39;.

Is there some argument I&#39;m leaving out? Am I doing something stupid? What does it mean by &quot;unmerged files?&quot; Isn&#39;t the whole point of merging to merge files? Do I have to commit my changes before I merge?

Trouble merging upstream changes back into my branch

I have multiple dicts/key-value pairs like this:  

    d1 = {key1: x1, key2: y1}  
    d2 = {key1: x2, key2: y2}  

I want the result to be a new dict (in most efficient way, if possible):  

    d = {key1: (x1, x2), key2: (y1, y2)}  

Actually, I want result d to be:  

    d = {key1: (x1.x1attrib, x2.x2attrib), key2: (y1.y1attrib, y2.y2attrib)}  

If somebody shows me how to get the first result, I can figure out the rest.

How to merge multiple dicts with same key or different key?

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 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

Content Type	Original Author	Original Content on Stackoverflow
Question	Stripes	View Question on Stackoverflow
Solution 1 - Git	William Pursell	View Answer on Stackoverflow
Solution 2 - Git	Jian	View Answer on Stackoverflow
Solution 3 - Git	gaizka	View Answer on Stackoverflow
Solution 4 - Git	alexglue	View Answer on Stackoverflow

How do I make git merge's default be --no-ff --no-commit?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Combine multiple JavaScript files into one JS file

How can I export tables to Excel from a webpage

Attributions