Well, for one thing, the default shell that comes with GitHub for Windows is [PoshGit](https://github.com/dahlbyk/posh-git), which is a [Windows Power Shell](https://en.wikipedia.org/wiki/Windows_PowerShell) environment for Git.  On the other hand, [Git Bash/msysGit](http://msysgit.github.io/) uses the [Bash shell](https://en.wikipedia.org/wiki/Bash_(Unix_shell)) (Bourne Again Shell) and [MinGW](https://en.wikipedia.org/wiki/Mingw), which is a port of a Linux style environment and command line tools.

PoshGit will let you use Windows and Power Shell commands with Git at the command line, while Git Bash will let you use MinGW/Linux tools with Git at the command line.

I am trying to save data across orientation changes. As demonstrated in the code below, I use `onSaveInstanceState()` and `onRestoreInstanceState()`. I try to get the saved value and I check if it is the correct value in `onRestoreInstanceState()`. But when I try to use the new value in `onCreate()`, I don&#39;t have the new value but the old one. 

    protected void onSaveInstanceState(Bundle outState) {
    		super.onSaveInstanceState(outState);
    		outState.putString(&quot;TEXT&quot;, user);
    
    	}
	protected void onRestoreInstanceState(Bundle savedInstanceState) {
		super.onRestoreInstanceState(savedInstanceState);
		savedUser = savedInstanceState.getString(&quot;TEXT&quot;);
		Log.d(&quot;enregistred value&quot;, savedUser);

	}



    public void onCreate(Bundle savedInstanceState) {
    		super.onCreate(savedInstanceState);
    		
    		int display_mode = getResources().getConfiguration().orientation;
    
    		if (display_mode == 1) {
    
    			setContentView(R.layout.main_grid);
    			mGrid = (GridView) findViewById(R.id.gridview);
    			mGrid.setColumnWidth(95);
    			mGrid.setVisibility(0x00000000);
    			// mGrid.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
    
    		} else {
    			setContentView(R.layout.main_grid_land);
    			mGrid = (GridView) findViewById(R.id.gridview);
    			mGrid.setColumnWidth(95);
    			Log.d(&quot;Mode&quot;, &quot;land&quot;);
    			// mGrid.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
    
    		}
    		Log.d(&quot;savedUser&quot;, savedUser);
    		if (savedUser.equals(&quot;admin&quot;)) { //value 0
    			adapter.setApps(appManager.getApplications());
    		} else if (savedUser.equals(&quot;prof&quot;)) { //value 1
    			adapter.setApps(appManager.getTeacherApplications());
    		} else {// default value
    			appManager = new ApplicationManager(this, getPackageManager());
    			appManager.loadApplications(true);
    			bindApplications();
    	    }
    }



How to use onSaveInstanceState() and onRestoreInstanceState()?

I am using socket.io and it was quick to setup (thanks to examples on their usage page) but i&#39;d like to find out more about what exactly is going on under covers and what&#39;s the technology that makes it work. 

what are the exact mechanics of socket.io?  

is it on port 80 or a separate one? 

does it really stay open or is that part simulated? 

is there a way to profile each socket event ? 
(sort of like using fiddler to see what happens in ajax calls)

how does socket.io work?

I&#39;m referring to the shell that comes with GitHub for Windows, and Git Bash (which has a stand alone installer).

What is the difference between Git Bash and the GitHub for Windows shell?

<p>I'm referring to the shell that comes with GitHub for Windows, and Git Bash (which has a stand alone installer).</p>


I&#39;ve been using **Git Extensions** for a while now (it&#39;s awesome!) but I haven&#39;t found a simple answer to the following:

Sometimes, when typing a commit message, a make a typo. My friend showed me how to fix it the following way (in Git Extentions):

&gt; Right-Click on the commit &gt; Advanced &gt; Fixup commit

![enter image description here][1]

Then I simply check the box &quot;Amend&quot; and rewrite my message and voila! My commit message is fixed.

However this other option &quot;Squash commit&quot;... I have always wondered what it does?!

**My question is:**

Would someone simply explain me what is the exact difference between **Squash commit** and **Fixup commit** in **Git/Git Extentions**? They look kind of... *&quot;similar&quot;* to me:
![enter image description here][2]
![enter image description here][3]


  [1]: http://i.stack.imgur.com/XK6Jt.png
  [2]: http://i.stack.imgur.com/qIHAX.png
  [3]: http://i.stack.imgur.com/FFuPd.png

What&#39;s the difference between &quot;squash&quot; and &quot;fixup&quot; in Git/Git Extension?

Let me describe my situation:

Mr Blond and Mr Orange are working on branch A that branches out of the master branch on commit M1. Branch A has 2 commits: A1 and A2.

    M1  
       \
        \
         A1 - A2


Meanwhile, Mr Orange committed and pushed 2 more commits on the master branch, M2 and M3.

    M1  - M2 - M3
       \
        \
         A1 - A2

Mr Blond pulls from the remote, and after a while decides to rebase onto the master branch:

    M1  - M2 - M3
       \         \
        \         \
         A1 - A2   A1` - A2`

Now A1\` and A2\` are the rebased commits that exist locally at Mr blond&#39;s, and A1 and A2 exist remotely. Mr Blond pushes his commits, using **-f** to force his changes and &quot;rewrite&quot; history. Now the remote repository looks like this:

    M1  - M2 - M3
                 \
                  \
                   A1` - A2`

But Mr. Orange worked on the A branch as well. His local repository still looks like this:

    M1  - M2 - M3
       \
        \
         A1 - A2

What does Mr. Orange need to do in order to be synchronized with A branch in the remote repository?

A normal pull won&#39;t work. Will **pull -f** force the changes from the remote locally? I know that deleting the local version of A and bringing it again from the remote repository will do the trick but that doesn&#39;t seem to be a good way to achieve that.

Git: Pulling a rebased branch

I want to remove my local repository entirely, but TGitCache.exe keeps an open handle to the directory. I would like to shut it down gracefully, delete the folder and start it again.

How can I stop and start TGitCache.exe gracefully

I have a project that has specified submodules in it. Everything works well on the dev machine. I have commited `.gitmodules` file and pulled on the production. However it does not pulled submodules.

If I go into submodule directories and call `git pull`, nothing happens.

What is the proper way to pull those submodules in the new project ?

Pull git submodules after cloning project from GitHub

I&#39;m using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.

But, I&#39;m wondering whether there is a nice way to interactively and visually resolve conflicts. For example, if pull detects conflicts, popping up a GUI-based conflict tool (e.g., P4Merge). Is it possible?

I am always doing manual conflict resolving, which is just painful.

This is, for example, a git `pull` message, from SourceTree.


    git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
    From W:\repo\
     * branch            master     -&gt; FETCH_HEAD   
    
    Updating 33c07bf..41e0249
    
    error: Your local changes to the following files would be overwritten by merge:
    	foo.cpp
    	goo.cpp
    	goo.hpp
    Please, commit your changes or stash them before you can merge.
    Aborting    
    
    Completed with errors, see above.



How to interactively (visually) resolve conflicts in SourceTree / git

I have been using `d2u` to convert line endings. After installing Puppy Linux I
noticed that it does not come with `d2u`, but `dos2unix`. Then I noticed that
Ubuntu is missing both by default.

What is another way to convert line endings?

Convert line endings

I&#39;m attempting to use SED through OS X Terminal to perform a find and replace.

Imagine I have this string littered throughout the text file: http://www.find.com/page

And I want to replace it with this string: http://www.replace.com/page

I&#39;m having trouble because I&#39;m not sure how to properly escape or use the &quot;/&quot; character in my strings.  For example if I simply wanted to find &quot;cat&quot; and replace with &quot;dog&quot; I&#39;ve found the following command that works perfectly:

    sed -i &#39;&#39; &#39;s/cat/dog/g&#39; file.txt

Does anyone have any ideas on how to achieve the same functionality only instead of cat and dog have strings or URLs that container the &quot;/&quot; character?  I tried many different ways of escaping the &quot;/&quot; characters but then it seems as if SED can no longer &quot;find&quot; the string and it doesn&#39;t perform any find &amp; replace actions.

Any help or tips are greatly appreciated.

Thanks!

How to use SED to find and replace URL strings with the &quot;/&quot; character in the targeted strings?

I have created a `.pgpass` file in my home directory which looks like this

`localhost:5432:somedb:someuser:somepass`

I am using a shell script which creates a directory and puts a pg_dump of `somedb` there :

    mkdir directory
    pg_dump somedb &gt; directory/somefile.dump

It still prompts for the password.
 
Where is the mistake here ?

postgresql: .pgpass not working

I&#39;m trying to find the files existing in one directory but not in the other, I tried to use this command:

    diff -q dir1 dir2

The problem with the above command that it finds both the files in `dir1` but not in `dir2` as well as the files in `dir2` but not in `dir1`, 

I am trying to find the files in `dir1` but not in `dir2` only.

Here&#39;s a small sample of what my data looks like

    dir1    dir2    dir3
    1.txt   1.txt   1.txt
    2.txt   3.txt   3.txt
    5.txt   4.txt   5.txt
    6.txt   7.txt   8.txt

Another question on my mind is how can I find the files in `dir1` but not in `dir2` or `dir3` in a single command?

Find the files existing in one directory but not in the other

I&#39;m curious as to why the backspace is necessary when setting IFS to split on newlines like this:

    IFS=$(echo -en &quot;\n\b&quot;)

Why can I not just use this (which doesn&#39;t work) instead?

    IFS=$(echo -en &quot;\n&quot;)

I&#39;m on a Linux system that is saving files with Unix line endings.  I&#39;ve converted my file with newlines to hex and it definitely only uses &quot;0a&quot; as the newline character.

I&#39;ve googled a lot and although many pages document the newline followed by backspace solution, none that I have found explain why the backspace is required.

-David.


When setting IFS to split on newlines, why is it necessary to include a backspace?

I&#39;m very new to Git. I&#39;ve been searching for an answer, but I couldn&#39;t find one.

In my computer I have a project folder like this:

    project_a
    --some_folder
    --another_folder
    --.git

And I have a repository on GitHub, let’s say `https://github.com/company/our_repo.git`. Under this repository I have some folders. So my goal is to put my `project_a` under `trunk/bin`. How do I achieve this? (Again, I&#39;m very very very new.)



How to add my current project to an already existing GitHub repository

Git push hangs everytime I try to push to github. I am using Cygwin and Windows 7. Git functions fine locally tracking branches, providing status, setting global user.name and user.email and allowing commits. 

I&#39;m still new and learning.

I enter `git push` , `git push origin master` or `git push -u origin master` and I get nothing but a blank line requiring me to ctl-c to get the prompt back. 

`ssh-keygen -t rsa -C &quot;me@example.com&quot;` asks me for a file name and hangs

`git push heroku master` hangs

`$ git status` returns `On branch master nothing to commit, working directory clean`

`$ git pull` returns `Already up to date`

`$ git remote -v` returns:

    heroku  git@heroku.com:myherokusite.git (fetch)
     
    heroku  git@heroku.com:myherokusite.git (push) origin  
    
    https://github.com/gitusername/appname.git (fetch) origin  
    
    https://github.com/gitusername/appname.git (push)
    
    or the correct ssh remote settings are returned when trying this with ssh

**Updated:** Using the SSH url `git@github.com:gitusername/gitrepo.git` also hangs

`git remote set-url origin https://github.com/gitusername/appname.git` is correct


**Updated:** I can see the git processes running in Windows Task Manager while it hangs.



I&#39;ve tried:

Using different internet connection locations

switching between https and ssh and it hangs

Uninstalled git. Reinstalled from: https://code.google.com/p/msysgit/downloads/list 

Uninstalled git. Installed Cygwin&#39;s git

Uninstalled git. Installed Github for Windows GUI app and it I WAS able to push. But this app has limited functionality, forces me out of my Cygwin window into another app which then forces me into a Windows command prompt for complete functionality which I thought I had escaped by using Cygwin. 

Spent many, many hours trying to resolve this, it worked faultlessly before, thanks.

**UPDATE 4/2014:** I rebuilt my entire machine Win 7, Cygwin etc and all is now working fine

Git push hangs when pushing to Github?

I&#39;m trying to get a list of an organization&#39;s all repositories, including private ones. (Or to be more specific, all of the private repositories a certain user has access to.)

Reqesting info for the organization (`https://api.github.com/orgs/acme?access_token=[...]`) shows that there indeed are plenty of private repositories:

    ...
    &quot;public_repos&quot;: 5,
    &quot;total_private_repos&quot;: 68, 
    &quot;owned_private_repos&quot;: 68, 
    ...

(The access token I&#39;m using had been previously [generated using the API][1] for username/passwd.)

But whatever I try to list the repos...

    https://api.github.com/orgs/acme/repos?access_token=[...]   

...GitHub API just returns the 5 public repositories. ([Documentation says][2] `type=all` is default. Also tried adding the parameter `type=private`; no difference.)

Any idea what I&#39;m doing wrong?

The user to whom the access token was generated in fact has Push &amp; Pull access to just some  of the organization&#39;s private repositories, but none of those appear in the list I get (just the 5 public repositories).


  [1]: http://developer.github.com/v3/oauth/#create-a-new-authorization
  [2]: http://developer.github.com/v3/repos/#list-organization-repositories

How to list organization&#39;s private repositories via GitHub API?

I am  trying to push my files to github using bash. They are already on there, and I am uploading a newer version with new lines and code, etc. But when I try `git add` and then `git status` it says: 

&gt; On branch master
&gt;
&gt; nothing to commit, working directory clean


And the file I am using was just modified.

Why doesn&#39;t git recognize that my file has been changed, therefore git add not working

Is there a way to view on GitHub:

- All my pull requests
- My open pull requests

The only place where I usually see that is in my *Contribution Activity*, which unfortunately does not go further than 1 month ago.

Content Type	Original Author	Original Content on Stackoverflow
Question	Ram Patra	View Question on Stackoverflow
Solution 1 - Git	user456814	View Answer on Stackoverflow

What is the difference between Git Bash and the GitHub for Windows shell?

Git Problem Overview

Git Solutions

Solution 1 - Git

how does socket.io work?

How to use onSaveInstanceState() and onRestoreInstanceState()?

Attributions