Try `git add -p` -- it will interactively let you add, skip, or split diff hunks.

Use [`git add -i`][1] to stage the lines then commit as normal, or use [git-cola][2] until you get used to the command line.

![Staging lines of a file][3]


  [1]: http://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging
  [2]: http://git-cola.github.io/
  [3]: http://i.stack.imgur.com/HvzbB.png

I have two branches, `email` and `staging`. `staging` is the latest one and I no longer need the old changes in `email` branch, yet I don&#39;t want to delete them.

So I just want to dump all the contents of `staging` into `email` so that they both point to the same commit. Is that possible?


How do I &#39;overwrite&#39;, rather than &#39;merge&#39;, a branch on another branch in Git?

I have been reading about how to build plug-ins and this &quot;MIME type&quot; keeps getting discussed in it. I have tried to look into it and know that it is Multipurpose Internet Mail Extensions (MIME) but no suitable explanation of how it relates to browser plug-ins, as in what I need to know about it for building plug-ins, is provided, please explain in clear and simple words. What is it? Why do plug-ins have a MIME type?

What is a MIME type?

&gt; **Possible Duplicate:**  
&gt; [How can I commit only part of a file in git](https://stackoverflow.com/questions/1085162/how-can-i-commit-only-part-of-a-file-in-git)  

&lt;!-- End of automatically inserted text --&gt;

How do I commit a few specific line ranges from a file to git? while ignoring some other line changes in the same file.

Commit specific lines of a file to git

> Possible Duplicate: 
> <a href="https://stackoverflow.com/questions/1085162/how-can-i-commit-only-part-of-a-file-in-git" target="_blank" rel="noopener noreferrer">How can I commit only part of a file in git</a>

How do I commit a few specific line ranges from a file to git? while ignoring some other line changes in the same file.

For some reason I&#39;m getting the error that &quot;More than one value for the key user.name&quot; when I try to set the user.name for my git account.  How can I set it to a single name?

More than one value for the key user.name Git


I forked a project on github, made some changes, so far so good.

In the meantime, the repository I forked from changed and I would like to get those changes into my repository. How do I do that ?

How to sync with a remote Git repository?

I&#39;ve read about some tricks with merge in https://stackoverflow.com/questions/1807036/git-merging-public-and-private-branches-while-while-keeping-certain-files-intact and others and not found a solution.

In my case I&#39;m feeling need to do opposite merge strategy. In parallel development I have to keep some files same across the arbitrary branches. From other side I do not want to do squash or no-commit merge, while difference are significant and could break current state of testing branch. 

What I want something like 

`git checkout testing`

`git merge config.xml -b development` or `git merge config\*.xml -b development`

I guess this is like `git merge-files ...` command, but second file delivered from the branch, not from the filesystem.
Is it possible? or may be there is a kind of workaround? submodules? attributes?

Thanks

git partial merge, not whole branch

I often have at least 3 remote branches: master, staging and production. I have 3 local branches that track those remote branches.

Updating all my local branches is tedious:

    git fetch --all
    git rebase origin/master
    git checkout staging
    git rebase origin/staging
    git checkout production
    git rebase origin/production

I&#39;d love to be able to just do a &quot;git pull -all&quot;, but I haven&#39;t been able to get it to work. It seems to do a &quot;fetch --all&quot;, then updates (fast forward or merges) the current working branch, but not the other local branches.

I&#39;m still stuck manually switching to each local branch and updating.

Can &quot;git pull --all&quot; update all my local branches?

I am very new to git and wondered how I should go about a merge where in the local repo I have deleted several files on the master branch but these files exist within the remote master branch.

After doing git-merge it shows the conflicts that have occured.

Using git gui it shows that the local file is deleted, while the remote branch file has contents.

How do you stop these files from being conflicted?
Is there a simple way using git gui?

Many thanks



Content Type	Original Author	Original Content on Stackoverflow
Question	erikvold	View Question on Stackoverflow
Solution 1 - Git	Adam DiCarlo	View Answer on Stackoverflow
Solution 2 - Git	Peter Coulton	View Answer on Stackoverflow

Commit specific lines of a file to git

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

What is a MIME type?

How do I 'overwrite', rather than 'merge', a branch on another branch in Git?

Attributions