Most probably, the contents of this file haven&#39;t changed, only the executable bit has been cleared. Try actually changing the file by, say, appending an empty line to it, and see what `git diff` outputs.

Apart from file contents, Git also records the state of the executable bit for each file. It makes sense on Linux systems if you want scripts to be executable right after checkout. See also the following two related questions:

https://stackoverflow.com/q/1580596/946850

https://stackoverflow.com/q/1257592/946850

It means that the file mode changed from 755 to 644, but the contents were not altered.

`git diff` is exactly what you are looking for - it shows the changes from unstaged files to the last commit. `git diff --cached` is for staged files.

In my `GHC Haskell` application utilizing stm, network-conduit and conduit, I have a strand for each socket which is forked automatically using `runTCPServer`. Strands can communicate with other strands through the use of a broadcasting TChan.

This showcases how I would like to set up the conduit &quot;chain&quot;:

![enter image description here][1]


  [1]: http://i.stack.imgur.com/E9zNx.png

So, what we have here is two sources (each bound to helper conduits which) which produce a `Packet` object which `encoder` will accept and turn into `ByteString`, then send out the socket. I&#39;ve had a great amount of difficulty with the efficient (performance is a concern) fusing of the two inputs.

I would appreciate if somebody could point me in the right direction.


----------

Since it would be rude of me to post this question without making an attempt, I&#39;ll put what I&#39;ve previously tried here;

I&#39;ve written/cherrypicked a function which (blocking) produces a Source from a TMChan (closeable channel);

    -- | Takes a generic type of STM chan and, given read and close functionality,
    --   returns a conduit &#39;Source&#39; which consumes the elements of the channel.
    chanSource 
        :: (MonadIO m, MonadSTM m)
        =&gt; a                    -- ^ The channel
        -&gt; (a -&gt; STM (Maybe b)) -- ^ The read function
        -&gt; (a -&gt; STM ())        -- ^ The close/finalizer function
        -&gt; Source m b
    chanSource ch readCh closeCh = ConduitM pull
        where close     = liftSTM $ closeCh ch
              pull      = PipeM $ liftSTM $ readCh ch &gt;&gt;= translate
              translate = return . maybe (Done ()) (HaveOutput pull close)

Likewise, a function to transform a Chan into a sink;

    -- | Takes a stream and, given write and close functionality, returns a sink
    --   which wil consume elements and broadcast them into the channel 
    chanSink
        :: (MonadIO m, MonadSTM m)
        =&gt; a                 -- ^ The channel
        -&gt; (a -&gt; b -&gt; STM()) -- ^ The write function
        -&gt; (a -&gt; STM())      -- ^ The close/finalizer function
        -&gt; Sink b m ()
    chanSink ch writeCh closeCh = ConduitM sink
        where close  = const . liftSTM $ closeCh ch
              sink   = NeedInput push close
              write  = liftSTM . writeCh ch
              push x = PipeM $ write x &gt;&gt; return sink

Then mergeSources is straightforward; fork 2 threads (which I really don&#39;t want to do, but what the heck) which can put their new items into the one list which I then produce a source of;

    -- | Merges a list of &#39;Source&#39; objects, sinking them into a &#39;TMChan&#39; and returns
    --   a source which consumes the elements of the channel.
    mergeSources
        :: (MonadIO m, MonadBaseControl IO m, MonadSTM m)
        =&gt; [Source (ResourceT m) a]             -- ^ The list of sources
        -&gt; ResourceT m (Source (ResourceT m) a)
    mergeSources sx = liftSTM newTMChan &gt;&gt;= liftA2 (&gt;&gt;) (fsrc sx) retn
        where push c s = s $$ chanSink c writeTMChan closeTMChan
              fsrc x c = mapM_ (\s -&gt; resourceForkIO $ push c s) x
              retn c   = return $ chanSource c readTMChan closeTMChan

While I was successful in making these functions typecheck, I was unsuccessful in getting any utilization of these functions to typecheck;

    -- | Helper which represents a conduit chain for each client connection
    serverApp :: Application SessionIO
    serverApp appdata = do
        use ssBroadcast &gt;&gt;= liftIO . atomically . dupTMChan &gt;&gt;= assign ssBroadcast
        -- appSource appdata $$ decoder $= protocol =$= encoder =$ appSink appdata
        mergsrc $$ protocol $= encoder =$ appSink appdata
        where chansrc = chanSource (use ssBroadcast) readTMChan closeTMChan
              mergsrc = mergeSources [appSource appdata $= decoder, chansrc]

    -- | Structure which holds mutable information for clients
    data SessionState = SessionState
        { _ssBroadcast     :: TMChan Packet -- ^ Outbound packet broadcast channel
        }

    makeLenses &#39;&#39;SessionState
    
    -- | A transformer encompassing both SessionReader and SessionState
    type Session m = ReaderT SessionReader (StateT SessionState m)
    
    -- | Macro providing Session applied to an IO monad
    type SessionIO = Session IO

I see this method as being flawed anyhow -- there are many intermediate lists and conversions. This can not be good for performance. Seeking guidance.

----------

PS. From what I can understand, this is not a duplicate of; https://stackoverflow.com/questions/15594556/fusing-conduits-with-multiple-inputs/15597009#15597009 , as in my situation both sources produce the same type and I don&#39;t care from which source the `Packet` object is produced, as long as I&#39;m not waiting on one while another has objects ready to be consumed.

PPS. I apologize for the usage (and therefore requirement of knowledge) of Lens in example code.

One processing conduit, 2 IO sources of the same type

I want to wrap a test project containing C++ and OpenMP code with Cython, and build it with distutils via a `setup.py` file. The content of my file looks like this:

    from distutils.core import setup
    from distutils.extension import Extension
    from Cython.Build import cythonize
    from Cython.Distutils import build_ext
    
    
    modules = [Extension(&quot;Interface&quot;,
    					 [&quot;Interface.pyx&quot;, &quot;Parallel.cpp&quot;],
    					 language = &quot;c++&quot;,
    					 extra_compile_args=[&quot;-fopenmp&quot;],
    					 extra_link_args=[&quot;-fopenmp&quot;])]
    
    for e in modules:
    	e.cython_directives = {&quot;embedsignature&quot; : True}
    
    setup(name=&quot;Interface&quot;,
    	 cmdclass={&quot;build_ext&quot;: build_ext},
    	 ext_modules=modules)

The `-fopenmp` flag is used with gcc to compile and link against OpenMP. However, if I just invoke

    cls ~/workspace/CythonOpenMP/src $ python3 setup.py build

this flag is not recognized, because the compiler is clang:

    running build
    running build_ext
    skipping &#39;Interface.cpp&#39; Cython extension (up-to-date)
    building &#39;Interface&#39; extension
    cc -Wno-unused-result -fno-common -dynamic -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -I/usr/local/include -I/usr/local/opt/sqlite/include -I/usr/local/Cellar/python3/3.3.0/Frameworks/Python.framework/Versions/3.3/include/python3.3m -c Interface.cpp -o build/temp.macosx-10.8-x86_64-3.3/Interface.o -fopenmp
    clang: warning: argument unused during compilation: &#39;-fopenmp&#39;
    cc -Wno-unused-result -fno-common -dynamic -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -I/usr/local/include -I/usr/local/opt/sqlite/include -I/usr/local/Cellar/python3/3.3.0/Frameworks/Python.framework/Versions/3.3/include/python3.3m -c Parallel.cpp -o build/temp.macosx-10.8-x86_64-3.3/Parallel.o -fopenmp
    clang: warning: argument unused during compilation: &#39;-fopenmp&#39;
    Parallel.cpp:24:10: warning: unknown pragma ignored [-Wunknown-pragmas]
            #pragma omp parallel for
                    ^
    1 warning generated.
    c++ -bundle -undefined dynamic_lookup -L/usr/local/lib -L/usr/local/opt/sqlite/lib build/temp.macosx-10.8-x86_64-3.3/Interface.o build/temp.macosx-10.8-x86_64-3.3/Parallel.o -o build/lib.macosx-10.8-x86_64-3.3/Interface.so -fopenmp
    ld: library not found for -lgomp
    clang: error: linker command failed with exit code 1 (use -v to see invocation)
    error: command &#39;c++&#39; failed with exit status 1

 I&#39;ve unsucessfully tried to specify gcc:

    cls ~/workspace/CythonOpenMP/src $ python3 setup.py build --compiler=g++-4.7
    running build
    running build_ext
    error: don&#39;t know how to compile C/C++ code on platform &#39;posix&#39; with &#39;g++-4.7&#39; compiler


How can I tell distutils to use gcc?







How to tell distutils to use gcc?

I&#39;m trying to view changes for a single file that is unstaged.

First I use `git status` to view all the unstaged changes then for example:  

    git diff AndroidManifest.xml

But I get this output:

    diff --git a/AndroidManifest.xml b/AndroidManifest.xml  
    old mode 100755  
    new mode 100644

What does that mean and how can I view changes for specific file?

What does it mean when Git diff shows mode changes?

I'm trying to view changes for a single file that is unstaged.
First I use <code>git status</code> to view all the unstaged changes then for example:
<pre><code class="hljs">git diff AndroidManifest.xml
</code></pre>
But I get this output:
<pre><code class="hljs language-css">diff --git a/AndroidManifest.xml b/AndroidManifest.xml 
old mode 100755 
new mode 100644
</code></pre>
What does that mean and how can I view changes for specific file?

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?

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

When I do `git diff COMMIT` I see the changes between that commit and HEAD (as far as I know), but I would like to see the changes that were made by that single commit.

I haven&#39;t found any obvious options on `diff` / `log` that will give me that output.


How can I see the changes in a Git commit?

Let&#39;s say I cloned a repository and started modifying files. I know that if I have local uncommitted changes, I can do a diff as follows `git diff test.txt` and it will show me the difference between the current local HEAD and the modified, uncommitted changes in the file. If I commit those changes I can diff it against the original repository by using `git diff master origin/master`

But is there any way of diff&#39;ing the local changes with the original repository on the server *before* committing locally? I tried various permutations of `git diff --cached master origin/master` with no luck.

How to Diff between local uncommitted changes and origin

Say I&#39;ve made a number of unrelated changes to uncoupled files in my git repo. I want to review and commit each of the files separately.

I run `magit-status`, and get a list of changed files. But the only magit diff commands I can find (`d` and `D`) diff entire revisons, not individual files.

I want the output of `git diff &lt;filename&gt;`, but in the magit diff buffer. How can I get magit to diff only one file? 

How can I diff a single file with magit?

The git diff engine is seeing a whole file as changed when it has not. For example, take this commit: https://github.com/etiago/phpvirtualbox/commit/626e09958384f479f94011ac3b8301bd497aec51

Here we see that the file **lib/vboxconnector.php** has 2807 additions and 2778 deletions. Additionally, from doing a manual git diff I find that indeed, the whole file is taken in as a deletion (marked with minus) and a whole new file is taken as an addition. However, the files have a lot in common which Git simply ignored.

I&#39;ve looked at https://stackoverflow.com/questions/12876350/diff-returning-entire-file-for-identical-files but it does not seem to be the case as no white space changes exist between the two commits.

Furthermore, taking the two commits of the file (the one in `626e09958384f479f94011ac3b8301bd497aec51` and `626e09958384f479f94011ac3b8301bd497aec51^1`) and diff&#39;ing them using Meld, I get the right diff analysis.

I&#39;ve uploaded the two commits of the file to my Dropbox for convenience: [commit_1](https://dl.dropboxusercontent.com/u/59728/disposables/vboxconnector.php_1) [commit_2](https://dl.dropboxusercontent.com/u/59728/disposables/vboxconnector.php_2).

git diff sees whole file as changed when it&#39;s not

Git offers these 4 diff algorithms, but without any further information what are their differences.

What are the advantages of each of this algorithms? Is there some comparison of various cases where the algorithms perform differently?

Content Type	Original Author	Original Content on Stackoverflow
Question	pedja	View Question on Stackoverflow
Solution 1 - Git	krlmlr	View Answer on Stackoverflow
Solution 2 - Git	Polygnome	View Answer on Stackoverflow

What does it mean when Git diff shows mode changes?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How to tell distutils to use gcc?

One processing conduit, 2 IO sources of the same type

Attributions