You can create a single diff (patch) between two tags using the following

    $ git diff tag1 tag2 -- &gt; the-patch.diff

Replace `tag1` and `tag2` to the tags you want.


You can create a single patch for multiple commits by using the `--stdout` option and directing the output to a file:

    git checkout tag2
    git format-patch tag1 --stdout &gt; patch1to2.patch



I found JPG does not support transparency, the alpha value is always 255. I am wondering only png supports transparency?

Only PNG supports transparency, is that true?

Is it possible to use the autoshrink property in conjunction on multiple lines on a `UILabel`? for example, the large text size possible on 2 available lines.

Autoshrink on a UILabel with multiple lines

I have two tags in my git in same branch. There are at least 5-6 commits between them. How can I create a single patch between the two tags so that it can be applied to a GitHub repo?

How to create patch between two tags with multiple commits between them?

<p>I have two tags in my git in same branch. There are at least 5-6 commits between them. How can I create a single patch between the two tags so that it can be applied to a GitHub repo?</p>


My boss decided recently to try out an outsourcing group &quot;for increased capacity&quot; as we modify an existing application to add new features. Despite my concern that the group he chose didn&#39;t seem to communicate well and wasn&#39;t asking enough questions to truly understand and be effective, we went with them anyway.

We set them up to collaborate on our Git repository (hosted on GitHub). We created a branch just for them (TheOutsourcedBranch, we&#39;ll call it) and requested that they to do all of their work within this branch.

Additionally, we asked that they push their commits at the end of each day so that we can get a decent idea of how fast they work and (more importantly) how good their code is.

Today they pushed for the first time. Five commits, all of them in master. I&#39;m trying to figure out how to move their commits from master into TheOutsourcedBranch, without losing the work they&#39;ve done (although from the looks of it, we&#39;re going to have to throw it away anyway).

![Visual Reference -- Orange dots are their commits, gray are mine.][1]

Orange dots are their commits, gray dots are mine.

I know there are a zillion questions about rebasing (and that might be what I need to do here) but I&#39;m having a hard time figuring out which of them apply to my specific case. And in case it matters, the outsourcing group and myself are the only people that are really using the repo right now.

Thanks in advance!


----------


**Edit:**
I may have found what I&#39;m looking for: https://stackoverflow.com/questions/1628563/git-move-recent-commit-to-a-new-branch

I&#39;d like to check my understanding, though. Locally, I create a branch off of master (TheOutsourcedBranch), which would contain everything A-H. Then I reset master back to C. Master would now contain A-C.

Assuming that is correct, that would be fine for me (locally). But then what do I need to do to &quot;force&quot; the remote repository (GitHub) to accept my local view of how things played out and discard its version of the history?

Once this has played out I think I can re-work this question to make it more generic/informative and cut out some fluff--otherwise it&#39;s probably a good candidate for deletion, I would guess.

  [1]: http://i.stack.imgur.com/2bkyX.png

Git - Moving Pushed Commits to a Different Branch

I found myself amending my commits quite often. I don&#39;t `stash` so much because I tend to forget I did so, especially when I want to save what I did before I leave or before a weekend, so I do a &quot;draft&quot; commit. Only thing is, when I amend the commit, it is still set to the original author date. Is there a (simple) way to update it when amending?

Update git commit author date when amending

Given a local / remote branch name, how could I get the hash of the commit that this branch points to?

How to find the hash of branch in Git?

I have a repo with file `foo` in the master branch. I switched to bar branch and made some changes to `foo`. How can I now run a `git diff` between this copy (which isn&#39;t committed yet) and the copy of the master branch?

diff current working copy of a file with another branch&#39;s committed copy

I want to take advantage of the git-merge algorithm on two arbitrary files in a git repo. Here is my working directory:

    folder/
        file1
        file2

file1 and file2 are similar, but I want to see how git would merge them as if they were different versions of the same file. In other words, I want something like this:

    git merge-files file1 file2 &gt; merge_of_file1_file2

Is there a way to do this?

run git merge algorithm on two individual files

I am looking for the command for creating a patch from the last commit made.

My workflow sometimes looks like this:

    vi some.txt
    git add some.txt
    git commit -m &quot;some change&quot;

Now I just want to write:

    git create-patch-from-last-commit-to-file SOME-PATCH0001.patch

What should I put there instead of `create-patch-from-last-commit-to-file`?

How do I simply create a patch from my latest git commit?

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

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?



Content Type	Original Author	Original Content on Stackoverflow
Question	Rishi	View Question on Stackoverflow
Solution 1 - Git	fajran	View Answer on Stackoverflow
Solution 2 - Git	Patrick Sanan	View Answer on Stackoverflow

How to create patch between two tags with multiple commits between them?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Autoshrink on a UILabel with multiple lines

Only PNG supports transparency, is that true?

Attributions