You have to tell git which branch you want to pull from the &quot;origin&quot; remote repos.

I guess you want the default branch (master) so `git pull origin master` should fix your problem.

See `git help branch`, `git help pull` and `git help fetch`  for more informations.

To fix it, assuming you are on the `master` branch and want to pull the `master` branch from the `origin` remote, in new enough Git versions (1.8 or newer):

    git branch -u origin/master master

(Analogously for other branches and/or remotes.)

If you can combine this with a push, it’s even shorter:

    git push -u origin master

Thereafter, a plain `git pull`/`git push` will do what you expect.

----

During the Git 1.7 series, `git branch` didn’t have the `-u` switch (only `git push` did), and instead you had to use the much longer `--set-upstream`:

    git branch --set-upstream master origin/master

Note the reversal of arguments compared to `-u`. I fumbled this order more than once.

----

All of these, by the way, are shorthands for doing the following, which you can still do explicitly:

    git config branch.master.remote origin
    git config branch.master.merge refs/heads/master

Before 1.7, you *had* to do it this way.

Message says exactly what it is about. Your current branch is not associated with (is not tracking) any branch in _origin_. So git doesn&#39;t know what to pull.

What to do? That depends...

In most usual situation you are working off some local branch _xyz_ which branched from _master_ which is cloned from _origin_&#39;s master. The usual way to resolve it is to switch to _master_ and pull to synchronize it with _origin_ and then come back to _xyz_ and `rebase master`.

But in your situation you might want to do something else. We can&#39;t know it without knowing details of your branches and remotes and how you intent to use them.


I found this project: http://code.google.com/p/standalonewebsocketserver/ for a WebSocket server, but I need to implement a WebSocket client in python, more exactly I need to receive some commands from XMPP in my WebSocket server.

Is there a WebSocket client implemented for Python?

I want to use a custom font for my android application which I am creating.  
I can individually change the typeface of each object from Code, but I have hundreds of them.

So,

  - Is there a way to do this from the XML? [Setting a custom typeface]
  - Is there a way to do it from code in one place, to say that the whole application and all the components should use the custom typeface instead of the default one?

Using a custom typeface in Android

I got this message from Git:

&gt; You asked to pull from the remote &#39;origin&#39;, but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.

Can anyone explain it? and more important how to fix it?

Confusing error message from git

I got this message from Git:
> You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
Can anyone explain it? and more important how to fix it?

We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts are not easy to resolve. I don&#39;t understand why there should be any conflicts at all, since I&#39;m just squashing commits (not deleting or rearranging). Very likely, this demonstrates that I&#39;m not completely understanding how git-rebase does its squashes.

Here&#39;s a modified version of the scripts I&#39;m using:

-----
repo_squash.sh (this is the script that is actually run):

-----

    rm -rf repo_squash
    git clone repo repo_squash
    cd repo_squash/
    GIT_EDITOR=../repo_squash_helper.sh git rebase --strategy theirs -i bd6a09a484b8230d0810e6689cf08a24f26f287a

-----
repo_squash_helper.sh (this script is used only by repo_squash.sh):

-----

    if grep -q &quot;pick &quot; $1
    then
    #  cp $1 ../repo_squash_history.txt
    #  emacs -nw $1
      sed -f ../repo_squash_list.txt &lt; $1 &gt; $1.tmp
      mv $1.tmp $1
    else
      if grep -q &quot;initial import&quot; $1
      then
        cp ../repo_squash_new_message1.txt $1
      elif grep -q &quot;fixing bad import&quot; $1
      then
        cp ../repo_squash_new_message2.txt $1
      else
        emacs -nw $1
      fi
    fi

-----
repo_squash_list.txt: (this file is used only by repo_squash_helper.sh)

-----

    # Initial import
    s/pick $251a190$/squash \1/g
    # Leaving &quot;Needed subdir&quot; for now
    # Fixing bad import
    s/pick $46c41d1$/squash \1/g
    s/pick $5d7agf2$/squash \1/g
    s/pick $3da63ed$/squash \1/g

-----

I&#39;ll leave the &quot;new message&quot; contents to your imagination. Initially, I did this without the &quot;--strategy theirs&quot; option (i.e., using the default strategy, which if I understand the documentation correctly is recursive, but I&#39;m not sure which recursive strategy is used), and it also didn&#39;t work. Also, I should point out that, using the commented out code in repo_squash_helper.sh, I saved off the original file that the sed script works on and ran the sed script against it to make sure it was doing what I wanted it to do (it was). Again, I don&#39;t even know why there *would* be a conflict, so it wouldn&#39;t seem to matter so much which strategy is used. Any advice or insight would be helpful, but mostly I just want to get this squashing working.

Updated with extra information from discussion with Jefromi:
---

Before working on our massive &quot;real&quot; repository, I used similar scripts on a test repository. It was a very simple repository and the test worked cleanly.

The message I get when it fails is:

    Finished one cherry-pick.
    # Not currently on any branch.
    nothing to commit (working directory clean)
    Could not apply 66c45e2... Needed subdir

This is the first pick after the first squash commit. Running `git status` yields a clean working directory. If I then do a `git rebase --continue`, I get a very similar message after a few more commits. If I then do it again, I get another very similar message after a couple dozen commits. If I do it yet again, this time it goes through about a hundred commits, and yields this message:

    Automatic cherry-pick failed.  After resolving the conflicts,
    mark the corrected paths with &#39;git add &lt;paths&gt;&#39;, and
    run &#39;git rebase --continue&#39;
    Could not apply f1de3bc... Incremental

If I then run `git status`, I get:

    # Not currently on any branch.
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #
    # modified:   repo/file_A.cpp
    # modified:   repo/file_B.cpp
    #
    # Unmerged paths:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #   (use &quot;git add/rm &lt;file&gt;...&quot; as appropriate to mark resolution)
    #
    # both modified:      repo/file_X.cpp
    #
    # 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:    repo/file_Z.imp

The &quot;both modified&quot; bit sounds weird to me, since this was just the result of a pick. It&#39;s also worth noting that if I look at the &quot;conflict&quot;, it boils down to a single line with one version beginning it with a [tab] character, and the other one with four spaces. This sounded like it might be an issue with how I&#39;ve set up my config file, but there&#39;s nothing of the sort in it. (I did note that core.ignorecase is set to true, but evidently git-clone did that automatically. I&#39;m not completely surprised by that considering that the original source was on a Windows machine.)

If I manually fix file_X.cpp, it then fails shortly afterward with another conflict, this time between a file (CMakeLists.txt) that one version thinks should exist and one version thinks shouldn&#39;t. If I fix this conflict by saying I do want this file (which I do), a few commits later I get another conflict (in this same file) where now there&#39;s some rather non-trivial changes. It&#39;s still only about 25% of the way through the conflicts.

I should also point out, since this might be very important, that this project started out in an svn repository. That initial history very likely was imported from that svn repository.

Update #2:
----

On a lark (influenced by Jefromi&#39;s comments), I decided to do the change my repo_squash.sh to be:

    rm -rf repo_squash
    git clone repo repo_squash
    cd repo_squash/
    git rebase --strategy theirs -i bd6a09a484b8230d0810e6689cf08a24f26f287a

And then, I just accepted the original entries, as is. I.e., the &quot;rebase&quot; shouldn&#39;t have changed a thing. It ended up with the same results describe previously.

Update #3:
---

Alternatively, if I omit the strategy and replace the last command with:

    git rebase -i bd6a09a484b8230d0810e6689cf08a24f26f287a

I no longer get the &quot;nothing to commit&quot; rebase problems, but I&#39;m still left with the other conflicts.

Update with toy repository that recreates problem:
---

test_squash.sh (this is the file you actually run):

    #========================================================
    # Initialize directories
    #========================================================
    rm -rf test_squash/ test_squash_clone/
    mkdir -p test_squash
    mkdir -p test_squash_clone
    #========================================================
    
    #========================================================
    # Create repository with history
    #========================================================
    cd test_squash/
    git init
    echo &quot;README&quot;&gt;README
    git add README
    git commit -m&quot;Initial commit: can&#39;t easily access for rebasing&quot;
    echo &quot;Line 1&quot;&gt;test_file.txt
    git add test_file.txt
    git commit -m&quot;Created single line file&quot;
    echo &quot;Line 2&quot;&gt;&gt;test_file.txt 
    git add test_file.txt 
    git commit -m&quot;Meant for it to be two lines&quot;
    git checkout -b dev
    echo Meaningful code&gt;new_file.txt
    git add new_file.txt 
    git commit -m&quot;Meaningful commit&quot;
    git checkout master
    echo Conflicting meaningful code&gt;new_file.txt
    git add new_file.txt 
    git commit -m&quot;Conflicting meaningful commit&quot;
    # This will conflict
    git merge dev
    # Fixes conflict
    echo Merged meaningful code&gt;new_file.txt
    git add new_file.txt
    git commit -m&quot;Merged dev with master&quot;
    cd ..
    
    #========================================================
    # Save off a clone of the repository prior to squashing
    #========================================================
    git clone test_squash test_squash_clone
    #========================================================
    
    #========================================================
    # Do the squash
    #========================================================
    cd test_squash
    GIT_EDITOR=../test_squash_helper.sh git rebase -i HEAD@{7}
    #========================================================
    
    #========================================================
    # Show the results
    #========================================================
    git log
    git gc
    git reflog
    #========================================================

test_squash_helper.sh (used by test_sqash.sh):

    # If the file has the phrase &quot;pick &quot; in it, assume it&#39;s the log file
    if grep -q &quot;pick &quot; $1
    then
      sed -e &quot;s/pick $.*$ $Meant for it to be two lines$/squash \1 \2/g&quot; &lt; $1 &gt; $1.tmp
      mv $1.tmp $1
    # Else, assume it&#39;s the commit message file
    else
    # Use our pre-canned message
      echo &quot;Created two line file&quot; &gt; $1
    fi


P.S.: Yes, I know some of you cringe when you see me using emacs as a fall-back editor.

P.P.S.: We do know we&#39;ll have to blow away all of our clones of the existing repository after the rebase. (Along the lines of &quot;thou shalt not rebase a repository after it&#39;s been published&quot;.)

P.P.P.S: Can anyone tell me how to add a bounty to this? I&#39;m not seeing the option anywhere on this screen whether I&#39;m in edit mode or view mode.




Why does git-rebase give me merge conflicts when all I&#39;m doing is squashing commits?

Let&#39;s say I have a repo that includes this directory structure:

    repo/
      blog/
        _posts/
          some-post.html
      another-file.txt

I want to move `_posts` to the top level of the repo, so the structure will look like this:

    repo/
      _posts/
        some-post.html
      another-file.txt

This is simple enough with `git mv`, but I want to make the history look as though `_posts` *always* existed at the root of the repo, and I want to be able to get the entire history of `some-post.html` via `git log -- _posts/some-post.html`. I imagine I can use some magic with `git filter-branch` to accomplish this, but I haven&#39;t figured out exactly how to do that. Any ideas?

How can I move a directory in a Git repo for all commits?

A riff on [git: show all changed files between two commits][1]: I want a listing of all files that have been changed between two commits, even if they are now the same (ie, changed and then changed back).

  [1]: https://stackoverflow.com/questions/1552340/git-show-all-changed-files-between-two-commits &quot;git: show all changed files between two commits&quot;

git: show all files changed between two commits

Every time I do a merge I need for a merge commit to be generated and I would like it to have more than just the summary of all the commits.

**My question is how can I format git-fmt-merge-msg or what determines this automated message** (I can do this manually after a commit by amending it and using git-log --pretty=format:&#39;...&#39;)

For example I would like to format it as such:

     Merge branch &#39;test&#39;  
        * test:  
          [BZ: #123] fifth commit subject  
          [BZ: #123] fourth commit subject  
          [BZ: #123] third commit subject  
          [BZ: #123] second commit subject  
          [BZ: #123] first commit subject  
    
     __________________________________________
     Merge details:  
         [BZ: #123] fifth commit subject  
                   at 2010-06-30 11:29:00 +0100  
           - fifth commit body  
     
         [BZ: #123] fourth commit subject  
                   at 2010-06-30 11:22:17 +0100  
           - fourth commit body  
     
         [BZ: #123] third commit subject  
                   at 2010-06-30 11:21:43 +0100  
           - third commit body  
     
         [BZ: #123] second commit subject  
                   at 2010-06-30 11:21:30 +0100  
           - second commit body  
     
         [BZ: #123] first commit subject  
                   at 2010-06-30 11:29:57 +0100  
           - first commit body

  [1]: https://stackoverflow.com/questions/3148863/how-can-i-customize-gits-merge-commit-message/3264341#3264341

how can I customize git&#39;s merge commit message?

Using [Chris&#39;s answer](https://stackoverflow.com/questions/3147097/how-to-prepend-the-past-to-a-git-repository/3148117#3148117) on another question I could prepend a snapshot-history to my git repository. Since one of the files is not part of my history but only in the snapshots, the first original commit now also contains the deletion of this file. How can I undo that?

*At first I thought this was the opposite of [How do I remove sensitive files from git’s history](https://stackoverflow.com/questions/872565/how-do-i-remove-sensitive-files-from-gits-history), but actually I don&#39;t want to insert a file into history but just remove the deletion from history.*

How to undelete a file previously deleted in git&#39;s history?

I&#39;m working on a small side-project and I&#39;m using connection strings and also api keys and values that should not be seen or used by other people. I use a public GitHub account for source control. What is the usual method for using source control when these values are in plain text in web.config?

Do I need to remove the values manually before checking in code? 

How to hide connection string, user name, pw when using source control?

I&#39;m having some trouble getting two different SSH keys/GitHub accounts to play well together.  I have the following setup:

Repos accessible from one account using `git@github.com:accountname`

Repos accessible from another account using `git@github.com:anotheraccount`

Each account has its own SSH key.  Both SSH keys have been added and I have created a config file.  I don&#39;t believe the config file is correct though.  I&#39;m not quite sure how to specify that repos accessed using `git@github.com:accountname` should use `id_rsa` and `git@github.com:anotheraccount` should use `id_rsa_anotheraccount`.  

Multiple GitHub Accounts &amp; SSH Config

Which is efficient? SSH:// or Git://  (File compression)

I understand in Git, git protocol is smart because there is a protocol agent on both ends of communication to compress the file transfer resulting in faster clone by efficiently using the network bandwidth.

From [an O&#39;Reilly book][1] I found the following statements.

    For secure, authenticated connections, the Git native 
    protocol can be tunneled over an SSH connection using
    the following URL templates:

    ssh: //[user@]example.com[:port]/path/to/repo.git
    ssh: //[user@]example.com/path/to/repo.git
    ssh: //[user@]example.com/~user2/path/to/repo.git
    ssh: //[user@]example.com/~/path/to/repo.git*

I&#39;m not sure if the author means what he says. He talks of git protocol getting tunneled over SSH. 

From my perspective, unless you connect to the git port (agent port), the protocol is not in effect. And SSH is merely an uncompressed file transfer. But as per the author, if we use SSH he says the git protocol is tunneled over it. So is SSH smarter in GIT?

Von C,
Thanks for your answer. &quot;Network protocols (HTTP and Git) are generally read-only&quot; Git can be made `rw` when you run the daemon with `--enable=receive-pack`. 

Following are my concerns.  
When they say git protocol is smart, they mean when you execute `git clone`, Git server agent compresses the data that is sent back to the client, so the clone should be faster. In my use case I&#39;ll be setting the Git server in Hongkong and using it on San Jose and other countries as well, So I want to be efficient over network due to latency concerns.

So my question is when I use `git clone ssh://user@server/reposloc` do I get the benefits of git protocol also? As per O&#39;Reilly author book he means git is tunneled over ssh, then how does git protocol work when I don&#39;t have git daemon running on the server.

So using SSh://xyz... does it give both the benefit of ssh and git protocols?

Appreciate your answers in advance.


  [1]: https://books.google.com/books?id=ZkXELyQWf4UC&amp;lpg=PA201&amp;pg=PA201

Which is the smarter git protocol, ssh or git(over ssh) or https protocol?

i use github and have successfully added and synched files on my laptop in the past. 

as of recent i started getting &quot;**PuTTY Fatal Error: Disconnected: No supported authentication methods available**&quot; after running:

git pull origin master (or push)

however

ssh git@github.com returns the correct response:
ERROR: Hi username! You&#39;ve successfully authenticated, but GitHub does not provide shell access
Connection to github.com closed.

after digging around on github i found this morcel:

**No supported authentication methods available**
You should be aware of the environment variable GIT_SSH, which is used by git to find your ssh-speaking client, if ssh doesn’t work for you. The git install may be using plink.exe (via GIT_SSH) to perform the authentication. If so, make sure you have pageant.exe running, and the key you created for github loaded into it. This provides the key to plink.exe; without it, the above error will occur.

not sure what plink.exe or peagant.exe is.. and the fact that ssh git@github.com seems to authenticate correctly makes me wonder what the best solution here is.. i certainly don&#39;t want to overcomplicate my setup if not necessary. 

github: No supported authentication methods available

I&#39;ve been using Git for a while now, and I recently started using it to tag my releases so that I could more easily keep track of changes and be able to see which version each of our clients is running (unfortunately the code currently mandates that each client have their own copy of the PHP site; I&#39;m changing this, but it&#39;s slow-going).

In any case, we&#39;re starting to build some momentum, and I thought it would be really good to be able to show people what has changed since the last release. The problem is, I haven&#39;t been maintaining a changelog, because I don&#39;t have a good idea of how to go about it. For this particular time, I can run through the log and manually create one, but that will get tiring very quickly.

I tried googling &quot;git changelog&quot; and &quot;git manage changelog&quot;, but I didn&#39;t find anything that really talked about the workflow of code changes and how that coincides with the changelog. We&#39;re currently following [Rein Henrichs&#39; development workflow][1] and I would love something that went along with that.

Is there a standard approach that I am missing, or is this an area where everybody does their own thing?

  [1]: http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html




Content Type	Original Author	Original Content on Stackoverflow
Question	cinek	View Question on Stackoverflow
Solution 1 - Git	p4bl0	View Answer on Stackoverflow
Solution 2 - Git	Aristotle Pagaltzis	View Answer on Stackoverflow
Solution 3 - Git	Tomek Szpakowicz	View Answer on Stackoverflow

Confusing error message from git

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Using a custom typeface in Android

Is there a WebSocket client implemented for Python?

Attributions