You can create a patch file by restricting the output of `git diff` by listing paths at the end of the command (after a `--` to avoid any potential clashes between path names and branch names).  

For example, you could do the following:

    git diff origin/master HEAD -- app/models/region.rb doc/ &gt; changes.patch

Above commands generate a patch that shows only the differences for a particular file: `region.rb` and a particular directory : `doc` when compared to `origin/master`

Then you can apply the patch using 

    patch -p1 &lt; changes.patch

The `-p1` tells patch to strip the `a/` and `b/` in the paths in the patch

You can include files in the patches with:

    git format-patch &lt;rev&gt; &lt;files...&gt;

Example

    git format-patch HEAD^^^ Makefile

Will give you three files 0001-[commit] ... 0003-[commit] only containing the Makefile.

In [C++11][11], there are two loops over all elements (range based for and for_each). Is there any reason to prefer one over the other or are there situations where one is a better fit?

    for (auto&amp; elem: container) {
      // do something with elem
    }
    
    std::for_each(container.begin(), container.end(),
                  [](Elem&amp; elem) {
                    // do something with elem
                  });

My idea would be that the first is simpler and is similar to range based loops in other languages while the second also works for sequences that are not complete containers and the second is more similar to other `std`-algorithms.

  [11]: http://en.wikipedia.org/wiki/C%2B%2B11


Preferred standard use: range based for or std::for_each

Is it possible to insert a raster image or a pdf image underneath a `geom_line()` on a `ggplot2` plot?

I wanted to be quickly able to plot data over a previously calculated plot that takes a long time to generate as it uses a large amount of data.

I read through this [example][1]. However, as it is over one year old I thought there might be a different way of doing this now.


  [1]: https://kohske.wordpress.com/2010/12/26/use-image-for-background-in-ggplot2/

Inserting an image to ggplot2

Let&#39;s say that I am 7 commits ahead of the origin/master repo. I would like to create a patch that includes in the patch specific files that were changed, not all the files. Or equivalent exclude specific files from the patch that were changed. How can I achieve that?

Create a patch including specific files in git

<p>Let's say that I am 7 commits ahead of the origin/master repo. I would like to create a patch that includes in the patch specific files that were changed, not all the files. Or equivalent exclude specific files from the patch that were changed. How can I achieve that?</p>


I have a submodule in a project in Jenkins. I&#39;ve enabled the advanced setting to recursively update submodules.

When I run the build, I see that the workspace has the files from the submodule. The problem is, it seems to be the first revision of the submodule. When I push changes (repository hosted on GitHub) Jenkins doesn&#39;t seem to update the submodule to get the right changes. Has anyone ever seen this?



Git submodules not updating in Jenkins build

I recently ran `git fsck --lost-found` on my repository.  

I expected to see a couple dangling commits, where I had reset `HEAD`.

However, I was surprised to see likely over several thousand dangling blob messages.

I don&#39;t believe anything is wrong with my repository, but I&#39;m curious as to what causes these dangling blobs? There&#39;s only two people working on the repository, and we haven&#39;t done anything out of the ordinary.

I wouldn&#39;t think they were created by an older version of a file being replaced by a new one, since git would need to hold onto both blobs so it can display history.

Come to think of it, at one point we did add a VERY large directory (thousands of files) to the project by mistake and then remove it.  Might this be the source of all the dangling blobs?

Just looking for insight into this mystery.

git: dangling blobs

I have a git repository hosted on github. Many of the files were initially developed on Windows, and I wasn&#39;t too careful about line endings. When I performed the initial commit, I also didn&#39;t have any git configuration in place to enforce correct line endings. The upshot is that I have a number of files with CRLF line endings in my github repository.

I&#39;m now developing partially on Linux, and I&#39;d like to clean up the line endings. How can I ensure the files are stored correctly with LF on github, and have LF in my working copy?

I&#39;ve set up a `.gitattributes` file containing `text eol=LF`; is that correct? With that committed and pushed, can I just `rm` my local repo and re-clone from github to get the desired effect?

Force LF eol in git repo and working copy

Is there any way to set up git such that it listens for updates from a remote repo and will pull whenever something changes? The use case is I want to deploy a web app using git (so I get version control of the deployed application) but want to put the &quot;central&quot; git repo on Github rather than on the web server (Github&#39;s interface is just soooo nice). 

Has anyone gotten this working? How does Heroku do it? My Google-fu is failing to give me any relevant results.

Git: auto pull from repository?

This is what happened:

I have a branch A. On branch A I committed a bunch of changes. I was not happy with the code, so I checked out the previous commit in branch A. I then made a bunch more changes and committed them on branch A. Now I can not find this commit anywhere. Did I lose this code?


What happens to git commits created in a detached HEAD state?

I have a simple problem. I have a path to a file in user directory that looks like this: 

    %USERPROFILE%\AppData\Local\MyProg\settings.file

When I try to open it as a file 

    ostream = new FileStream(fileName, FileMode.Open);

It spits error because it tries to add `%userprofile%` to the current directory, so it becomes:

    C:\Program Files\MyProg\%USERPROFILE%\AppData\Local\MyProg\settings.file

How do I make it recognise that a path starting with `%USERPROFILE%` is an absolute, not a relative path?

PS: I cannot use

    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)

Because I need to just open the file by its name. User specifies the name. If user specifies &quot;settings.file&quot;, I need to open a file relative to program dir, if user specifies a path starting with `%USERPROFILE%` or some other thing that converts to C:\something, I need to open it as well!

c# open file, path starting with %userprofile%

I am trying to get file content in bytes in Android application. I have get the file in SD card now want to get the selected file in bytes. I googled but no such success. Please help

Below is the code to get files with extension. Through this i get files and show in spinner. On file selection I want to get file in bytes.


 

    private List&lt;String&gt; getListOfFiles(String path) {
     
       File files = new File(path);
     
       FileFilter filter = new FileFilter() {
     
          private final List&lt;String&gt; exts = Arrays.asList(&quot;jpeg&quot;, &quot;jpg&quot;, &quot;png&quot;, &quot;bmp&quot;, &quot;gif&quot;,&quot;mp3&quot;);
     
          public boolean accept(File pathname) {
             String ext;
             String path = pathname.getPath();
             ext = path.substring(path.lastIndexOf(&quot;.&quot;) + 1);
             return exts.contains(ext);
          }
       };
     
       final File [] filesFound = files.listFiles(filter);
       List&lt;String&gt; list = new ArrayList&lt;String&gt;();
       if (filesFound != null &amp;&amp; filesFound.length &gt; 0) {
          for (File file : filesFound) {
             list.add(file.getName());
          }
       }
       return list;
    }

 

Android : How to read file in bytes?

When using `&lt;input type=&quot;file&quot; multiple&gt;` it&#39;s possible for the user to choose multiple files.

How does ones sets a limit for how many files can be chosen, for instance two?

How to limit the maximum files chosen when using multiple file input

I have a little piece of Ruby code:

    files.each do |file|
      FileUtils.mkdir_p(File.dirname(target))    
      FileUtils.cp_r(file, target, :verbose =&gt; true)
    end

I would like to add a check like

    if file is a folder
      # do this
    if file is a file
      # do that

How do I implement in Ruby?

Check if a filename is a folder or a file

I understand that ExternalFiles is to be used on API 8 and up and getExternalStorageDirectory is for 7 and down. However I am a little confused between the use. For example I wanted to check that a folder that exists and previously you would use something like:

    File ChildFolder = new File(Environment.getExternalStorageDirectory() + &quot;/ParentFolder/Child&quot;);

However every example I see says to use getExternalFilesDir (null), File.ext. Since I am above API 8 I want to use this method but how do I just check for a folder? I will check for a files existence at another point but for now just want to see if the folders exist??


Difference between getExternalFilesDir and getExternalStorageDirectory()

I know there are several threads on this already, but no one has fully explained exactly how to perform the initial diff to create the patch file, then how to *apply* that patch to the initial directory to update it.

In my case, there is a directory of files that anyone can download from the web. I have taken that directory and made changes to it, and want to create a patch file such that others can apply it to the downloaded directory to reproduce exactly what I have in my modified directory.

Help? What do I need to tell the other person with respect to how to apply my patch?

How to create a patch for a whole directory to update it?

    def f1():
        return 10, True
    
    def f2():
        num, stat = f1()
        return 2*num, stat



How do I use python&#39;s mock library to patch `f1()` and return a custom result so I could test `f2()`?

**Edited:**
Is there something wrong with my test? This doesn&#39;t seem to be working, all the tests failed with AssertionError
    
    from foo.bar import f2
    from mock import patch

    class MyTest(TestCase):

        def test_f2_1(self):
            with patch(&#39;project.module.f1&#39;) as some_func:
                some_func.return_value = (20, False)
                num, stat = f2()
                self.assertEqual((num, stat), (40, False))
       
       @patch(&#39;project.module.f1&#39;)
       def test_f2_2(self, some_func):
           some_func.return_value = (20, False)
           num, stat = f2()
           self.assertEqual((num, stat), (40, False))

Python mock patch a function called by another function

I would like to make a SVN type patch file for `httpd.conf` so I can easily apply it to other hosts.

If I do

    cd /root
    diff -Naur /etc/httpd/conf/httpd.conf_original /etc/httpd/conf/httpd.conf &gt; httpd.patch
    cp /etc/httpd/conf/httpd.conf_original /etc/httpd/conf/httpd.conf
    patch &lt; httpd.patch

I get:

    can&#39;t find file to patch at input line 3
    Perhaps you should have used the -p or --strip option?
    The text leading up to this was:
    --------------------------
    |--- /etc/httpd/conf/httpd.conf_original	2012-04-26 13:36:08.331068438 +0200
    |+++ /etc/httpd/conf/httpd.conf	2012-04-26 14:27:36.857075085 +0200
    --------------------------
    File to patch: 

**Question**

What am I doing wrong?



How to make and apply SVN patch?

    + bbb
    - aaa
    
    # ---
    # To remove &#39;-&#39; lines, make them &#39; &#39; lines (context).
    # To remove &#39;+&#39; lines, delete them.
    # Lines starting with # will be removed.
    #
    # If the patch applies cleanly, the edited hunk will immediately be
    # marked for staging. If it does not apply cleanly, you will be given
    # an opportunity to edit again. If all lines of the hunk are removed,
    # then the edit is aborted and the hunk is left unchanged.

I simply don&#39;t understand what `make them &#39; &#39; lines` means. How to apply `+ bbb` only but not `- aaa`?

git hunk edit mode - how to remove a &#39;-&#39; line?

Both `git am` and `git apply` can be used to apply patches. I fail to see the difference. I see a difference now: `git am` automatically commits whereas `git apply` only touches the files but doesn&#39;t create a commit. Is that the only difference?

Content Type	Original Author	Original Content on Stackoverflow
Question	vasilakisfil	View Question on Stackoverflow
Solution 1 - Git	Mark Longair	View Answer on Stackoverflow
Solution 2 - Git	lars	View Answer on Stackoverflow

Create a patch including specific files in git

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Inserting an image to ggplot2

Preferred standard use: range based for or std::for_each

Attributions