Add their github fork repo as a remote to a clone of your own repo:

    git remote add other-guys-repo &lt;url to other guys repo&gt;

Get their changes:

    git fetch other-guys-repo

Checkout the branch where you want to merge:

    git checkout my_new_branch

Merge their changes in (assuming they did their work on the master branch):

    git merge other-guys-repo/master

Resolve conflicts, commit the resolutions and voila.

i have a little problem with my script, where i need to convert ip in form &#39;xxx.xxx.xxx.xxx&#39; to integer representation and go back from this form.

    def iptoint(ip):
    	return int(socket.inet_aton(ip).encode(&#39;hex&#39;),16)
	
    def inttoip(ip):
    	return socket.inet_ntoa(hex(ip)[2:].decode(&#39;hex&#39;))
    
    
    In [65]: inttoip(iptoint(&#39;192.168.1.1&#39;))
    Out[65]: &#39;192.168.1.1&#39;
    
    In [66]: inttoip(iptoint(&#39;4.1.75.131&#39;))
    ---------------------------------------------------------------------------
    error                                     Traceback (most recent call last)
    
    /home/thc/&lt;ipython console&gt; in &lt;module&gt;()
    
    /home/thc/&lt;ipython console&gt; in inttoip(ip)
    
    error: packed IP wrong length for inet_ntoa`

Anybody knows how to fix that?

Conversion from IP string to integer, and backward in Python

I have a commit xyz in my local branch that I want to check if it is included in a remote release repository; can I do that in some easy way? I could clone the remote repo, but I&#39;m hoping for a nicer+faster way. `git ls-remote` seemed promising, but found nothing of value to me there. Thanks!

git: check if commit xyz in remote repo?

I have a repository on github, and someone else has forked it and made changes.

I want to:

1. Create a new branch
2. Merge their changes into my branch

I have created the new branch:

    git commit -b my_new_branch

How do I merge their code into this new branch? 

This is the branch that I have created: https://github.com/poundifdef/VirginMobileMinutesChecker/tree/widget_toast

This is the branch that I want to merge:
https://github.com/xbakesx/VirginMobileMinutesChecker

What is the best way to do this? I&#39;ve tried a &quot;pull&quot; and it won&#39;t work. I honestly have no idea what I&#39;m doing in gitland, so if there is a better way to accomplish this (besides my creating a branch and trying to merge) then I am all ears!

Git merge from someone else&#39;s fork

I have a repository on github, and someone else has forked it and made changes.
I want to:
<ol>
<li>Create a new branch</li>
<li>Merge their changes into my branch</li>
</ol>
I have created the new branch:
<pre><code class="hljs language-css">git commit -b my_new_branch
</code></pre>
How do I merge their code into this new branch?
This is the branch that I have created: <a href="https://github.com/poundifdef/VirginMobileMinutesChecker/tree/widget_toast" target="_blank" rel="noopener noreferrer">https://github.com/poundifdef/VirginMobileMinutesChecker/tree/widget_toast</a>
This is the branch that I want to merge:
<a href="https://github.com/xbakesx/VirginMobileMinutesChecker" target="_blank" rel="noopener noreferrer">https://github.com/xbakesx/VirginMobileMinutesChecker</a>
What is the best way to do this? I've tried a "pull" and it won't work. I honestly have no idea what I'm doing in gitland, so if there is a better way to accomplish this (besides my creating a branch and trying to merge) then I am all ears!

My current base has a total size of approx. 200MB.

But my .git folder has an amazing size of 5GB (!). Since I push my work to an external server, i don&#39;t need any big local history...

How can I shrink the .git folder to free up some space on my notebook? Can I delete all changes that are older, than 30 days?



How to shrink the .git folder

This sounds so simple, but I just can&#39;t figure it out. I made an experimental branch a while ago, and now I&#39;d like to pull in all the changes that happened on master since I made it. This is all local. I want to pull from local master into local my_branch, but I can&#39;t do it. This doesn&#39;t seem to work, telling me that master isn&#39;t a git repository:

    git pull master

How to &quot;pull&quot; from a local branch into another one?

Quite often, Git and [Ruby on Rails][1] looks like magic... such as in the [first chapter of Ruby on Rails 3 Tutorial book][2], it talks about Git:

    git remote add origin git@github.com:peter/first_app.git
    git push origin master

And it pretty much says &quot;it just works&quot; without saying too much about what they are and start talking about branching.  Searching on the Internet shows that `git remote add` is to add a &quot;short name&quot;, such as `origin`, and it can be any name as well, which is like an alias to a URL.

And `origin` is the usual path of where the remote repository points to (in http://git-scm.com/book/en/Git-Basics-Working-with-Remotes under &quot;Adding Remote Repositories&quot;).

So why is the URL not `git://git@github.com/peter/first_app.git`, but in the other syntax -- what syntax is it?  Why must it end with `.git`?   I tried not using `.git` at the end and it works too.  If not `.git`, what else can it be?  The `git` in `git@github.com` seems to be a user account on the Git server?

Also, why does it need to be so verbose to use `git push origin master`?  Can&#39;t the default be origin and master?  I found that the first time, the `origin master` is needed, but after a small edit and commit, then `git push` is all it needs (no need `origin master`).  Can somebody who knows what is going on give some details?

Sometimes it feels like a lot of magic without explanation... and sometimes the person using it is so confident and when asked why, can&#39;t explain it, and respond with something like &quot;that&#39;s the way it is&quot;.  Sometimes very practical and pragmatic.  It is not bad to be practical, but probably not practical to the point to not know what is going on.

  [1]: https://en.wikipedia.org/wiki/Ruby_on_Rails
  [2]: http://ruby.railstutorial.org/chapters/beginning#sec:version_control




What is &quot;git remote add ...&quot; and &quot;git push origin master&quot;?

I want to do `git push origin` and `git push my_other_remote` in the same line. Possible?

Git: Pushing to two repos in one command

How can I get output like in  `git diff --color-words`, but outside Git?

Closest thing is `wdiff  -t`, but it underlines/inverts things instead of using green/red colours and does not allow specifying my whitespace regex.

How can I use `git diff --color-words` outside a Git repository?

Once a directory is renamed, &quot;git log&quot; no longer shows its history, unless you force it to, by using &quot;git log --follow&quot;.

Is there a way to force the &quot;history&quot; function on the GitHub web UI to use &quot;--follow&quot;?

Alternatively - is there *any* way to see pre-rename history on GitHub?


How to make github follow directory history after renames?

&gt; **Possible Duplicate:**  
&gt; [Change repo name in github](https://stackoverflow.com/questions/5751585/change-repo-name-in-github)  

&lt;!-- End of automatically inserted text --&gt;

I got some github repos that i now need to rename, but i can&#39;t anywhere find a solution for this except deleting the repo and setting up a new one. I can&#39;t delete the repos, because there are a lot of links pointing to the current repos, which i don&#39;t want to loose. Anyone any idea on how to do this? (I already read a lot of the google results and searched the github support).

how to rename a repository on github?

I have a bug fix in my master, and I also want my branch to get that bug fix.  What `git` command do I use?

How can I keep my branch up to date with master with git?

If I want to merge into a Git branch the changes made only to some of the files changed in a particular commit which includes changes to multiple files, how can this be achieved?

Suppose the Git commit called `stuff` has changes to files `A`, `B`, `C`, and `D` but I want to merge only `stuff`&#39;s changes to files `A` and `B`. It sounds like a job for `git cherry-pick` but `cherry-pick` only knows how to merge entire commits, not a subset of the files.

How to git-cherry-pick only changes to certain files?

I&#39;ve got a project hosted on GitHub which somebody has forked. On their fork, they&#39;ve created a new branch &quot;foo&quot; and made some changes.  How do I pull their &quot;foo&quot; into a new branch also named &quot;foo&quot; in my repo?

I understand they could submit a pull request to me, but I&#39;d like to initiate this process myself.

Assume the following:

 1. Because they forked my project, both our repos share the same &#39;history&#39;
 2. Although GitHub shows their project was forked from mine, my local repository doesn&#39;t have any references to this person&#39;s project. Do I need to add theirs as a remote?
 3. I don&#39;t have a branch called &quot;foo&quot; yet - I don&#39;t know if I need to manually create this first.
 4. I definitely want this pulled into a separate branch and not my master.


How to pull remote branch from somebody else&#39;s repo

I need some help with a Bash script that will automatically add the git&#39;s branch name as a hash in commit messages.

How to add Git&#39;s branch name to the commit message?

I have a git branch called `9-sign-in-out` with perfectly working code, and I want to turn it into the master. I&#39;m currently on the master branch.

    $ git branch
    9-sign-in-out
    * master

I&#39;m trying to switch to `9-sign-in-out` branch, but it doesn&#39;t allow me to:

    $ git checkout 9-sign-in-out
    app/helpers/application_helper.rb: needs merge
    config/routes.rb: needs merge
    error: you need to resolve your current index first

Any idea how can I ignore all the master branch errors and turn the `9-sign-in-out` branch into the master? Maybe git [rebase][1]? But I don&#39;t want to lose the code in `9-sign-in-out` branch.


  [1]: http://git-scm.com/docs/git-rebase

Git merge errors

I create a new branch in Git:

    git branch my_branch

Push it:

    git push origin my_branch

Now say someone made some changes on the server and I want to pull from `origin/my_branch`. I do:

    git pull

But I get:

    You asked me to pull without telling me which branch you
    want to merge with, and &#39;branch.my_branch.merge&#39; in
    your configuration file does not tell me, either. Please
    specify which branch you want to use on the command line and
    try again (e.g. &#39;git pull &lt;repository&gt; &lt;refspec&gt;&#39;).
    See git-pull(1) for details.
    
    If you often merge with the same branch, you may want to
    use something like the following in your configuration file:
    
        [branch &quot;my_branch&quot;]
        remote = &lt;nickname&gt;
        merge = &lt;remote-ref&gt;
    
        [remote &quot;&lt;nickname&gt;&quot;]
        url = &lt;url&gt;
        fetch = &lt;refspec&gt;
    
    See git-config(1) for details.

I learned that I can make it work with:

    git branch --set-upstream my_branch origin/my_branch

But why do I need to do this for every branch I create? Isn&#39;t it obvious that if I push `my_branch` into `origin/my_branch`, then I would want to pull `origin/my_branch` into `my_branch`? How can I make this the default behavior?

Why do I need to do `--set-upstream` all the time?

I&#39;m from a Subversion background and, when I had a branch, I knew what I was working on with &quot;These working files point to this branch&quot;.

But with Git I&#39;m not sure when I am editing a file in NetBeans or Notepad++, whether it&#39;s tied to the master or another branch.

There&#39;s no problem with `git` in bash, it tells me what I&#39;m doing.


Content Type	Original Author	Original Content on Stackoverflow
Question	poundifdef	View Question on Stackoverflow
Solution 1 - Git	Ilkka	View Answer on Stackoverflow

Git merge from someone else's fork

Git Problem Overview

Git Solutions

Solution 1 - Git

git: check if commit xyz in remote repo?

Conversion from IP string to integer, and backward in Python

Attributions