You can use
  
    git diff master..yourbranch path/to/folder

`git diff` compares trees (as in hierarchies of source files at two different points in time), so it can&#39;t extract the changes done by a certain author. If you want to see what changes a user committed, then you need `git log`.

Does this solve your need?

    git log --author=jdoe oldbranch..newbranch -p -- path/to/subdirectory &gt; myChangesInSubdirectory.patch

This lists each commit done by _jdoe_ between the two commits, printing them as a patch instead of the usual commit summary, limiting only to commits that have changes in the target subdirectory, and redirects the output to a file.

Assume I want to unit test a method with this signature:

    List&lt;MyItem&gt; getMyItems();

Assume `MyItem` is a Pojo that has many properties, one of which is `&quot;name&quot;`, accessed via `getName()`.

All I care about verifying is that the `List&lt;MyItem&gt;`, or any `Iterable`, contains two `MyItem` instances, whose `&quot;name&quot;` properties have the values `&quot;foo&quot;` and `&quot;bar&quot;`.  If any other properties don&#39;t match, I don&#39;t really care for the purposes of this test.  If the names match, it&#39;s a successful test.

I would like it to be one-liner if possible. Here is some &quot;pseudo-syntax&quot; of the kind of thing I would like to do.  

    assert(listEntriesMatchInAnyOrder(myClass.getMyItems(), property(&quot;name&quot;), new String[]{&quot;foo&quot;, &quot;bar&quot;});

Would Hamcrest be good for this type of thing?  If so, what exactly would be the hamcrest version of my pseudo-syntax above?


How do I assert an Iterable contains elements with a certain property?

In this code:

    private async void button1_Click(object sender, EventArgs e) {
        try {
            await Task.WhenAll(DoLongThingAsyncEx1(), DoLongThingAsyncEx2());
        }
        catch (Exception ex) {
            // Expect AggregateException, but got InvalidTimeZoneException
        }
    }

    Task DoLongThingAsyncEx1() {
        return Task.Run(() =&gt; { throw new InvalidTimeZoneException(); });
    }
       
    Task DoLongThingAsyncEx2() {
        return Task.Run(() =&gt; { throw new InvalidOperation();});
    }

I expected `WhenAll` to create and throw an `AggregateException`, since at least one of the tasks it was awaiting on threw an exception. Instead, I&#39;m getting back a single exception thrown by one of the tasks.  

Does `WhenAll` not always create an `AggregateException`?


Why doesn&#39;t await on Task.WhenAll throw an AggregateException?

As in the title, I want to have a diff file for a certain folder between the master branch and a branch I have created.

Differences for a certain folder between git branches

<p>As in the title, I want to have a diff file for a certain folder between the master branch and a branch I have created.</p>


Is it possible to unstage the last staged (not committed) change in **git**? Suppose there were a lot of files in the current branch, some staged, some not. At some point, some foolish programmer accidentally executed:

    git add -- .

...instead of:

    git checkout -- .

Can this programmer now unstage his last changes with some magical **git** command? Or should he have committed before experimenting in the first place?

How can you undo the last git add?

Is there any way to see why some file is getting ignored by git (i.e. which rule in a `.gitignore` file is causing the file to be ignored)?

Imagine I have this (or a much more complex scenario, with hundreds of folders and tens of `.gitignore` files:

    /
    -.gitignore
    -folder/
        -.gitignore
        -subfolder/
                  -.gitignore
                  -file.txt

If I run `git add folder/subfolder/file.txt` git may complain of it being ignored:

    The following paths are ignored by one of your .gitignore files:
    folder/subfolder/file.txt
    Use -f if you really want to add them.

Is there any way to know which of all the possible `.gitignore` have a rule to ignore this file, and also show the rule? Like:

    The following paths are ignored by your folder/.gitignore file (line 12: *.txt)
    folder/subfolder/file.txt
    Use -f if you really want to add them.

Or just:

    $ git why-is-ignored folder/subfolder/file.txt
    folder/.gitignore:12:*.txt


Explain which gitignore rule is ignoring my file

Just want to get a better understanding of the warning message after I deleted a local branch

&gt; warning: deleting branch `&#39;old_branch&#39;` that has been merged to
         `&#39;refs/remotes/origin/old_branch&#39;`, but not yet merged to `HEAD`.


git branch -d gives warning

I have a project that is open sourced using `git` for revision control. Soon, I am going to release a premium hosted version of the project as well, but there will be changes made to the code specifically for the premium hosted version (performance, etc.), that should not exist in the open source version.

I want to avoid having two separate directories/projects, because if I fix a bug in the open source version, that bug is most likely in the premium hosted version as well. I don&#39;t want to make changes in two places.

What is the best way to manage this? Simply branching in `git` won&#39;t work right, because some files need to have 2 versions: an open source version and a premium hosted version.


How to manage multiple versions of a project?

Is there any way on [GitHub][1] to list all commits made by a single author, in the browser (neither locally, e.g. via `git log`, nor via the API)?

Clicking on a user name in the list of commits (Commit History) simply leads to that user&#39;s profile page. Examining the GitHub UI and searching (Google, StackOverflow) does not reveal a way to do this.


  [1]: http://github.com/

GitHub - List commits by author

Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting to pull from the server when I get the following error:

    $ git pull
    fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
    Please, commit your changes before you can merge.
    $

Git status reads:

    $ git status
    # On branch main
    # Your branch is behind &#39;origin/main&#39; by 2 commits, and can be fast-forwarded.
    #
    $

I have tried the following to no avail:

    $ git cherry-pick --continue
    usage: git cherry-pick [options] &lt;commit-ish&gt;
    $

Any idea on how I could resolve this? Thanks in advance!

How to Conclude a Git Cherry-Pick?

Say I start a git repository in a folder, and I have several subdirectories in it.

I have several globbing patterns `.gitignore` to exclude files in the subdirectories. However, when I do `git status` **before I stage anything**, git status only shows the names of the subfolders that will be added, without being specific about which files in each subdirectory will be added (staged) if I do `git add .`.  

Interestingly though, `git status` is explicit about the files that will be **committed** after I stage files with `git add .`.


Is there anyway to ask `git status` to be explicit about files for the files that would be **staged**?

git status -&gt; Show files that will be added (staged) in subdirectories

I&#39;m a little confused with `composer.lock` used in an application with a repository.

I saw many people saying that we should not `.gitignore` `composer.lock` from the repository.

If I update my libraries in my dev environment, I will have a new `composer.lock` but I will not be able to update them into production, will I ?

Won&#39;t it generate conflicts on this file ?

Should composer.lock be committed to version control?

I&#39;ve been using Git for a while now and have recently downloaded an update only to find this warning message come up when I try to `push`.

    warning: push.default is unset; its implicit value is changing in 
    Git 2.0 from &#39;matching&#39; to &#39;simple&#39;. To squelch this message 
    and maintain the current behavior after the default changes, use: 
    
      git config --global push.default matching

    To squelch this message and adopt the new behavior now, use: 

      git config --global push.default simple


I can obviously set it to one of the values mentioned, but what do they mean? What&#39;s the difference between `simple` and `matching`?

If I change it on one client will I need to do anything on other clients that I share repos with?

Warning: push.default is unset; its implicit value is changing in Git 2.0

I have a .diff file created by a coworker, and would like to apply the changes listed in that diff file to my local branch of the exact same repository.  I do not have access to that worker&#39;s pc or branch that was used to generate this diff file.

Obviously I could go line by line and retype everything, but i&#39;d rather not subject the system to human error. What&#39;s the easiest way to do this?

How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?

Is there a way to show the git-diff filtered by a given pattern.

Something like 

    git grepdiff pattern

    changed file
    +++ some sentence with pattern
    changed file 2
    --- some other pattern

Unfortunately the simplest solution is not good enough

    git diff | grep pattern 
    
    +++ some sentence with pattern
    --- some other pattern
    # not an option as doesn&#39;t put the filename close to the match

I came with a workaround using awk

    git diff | awk &quot;/\+\+\+/{f = \$2}; /PATTERN/ {print f \$0} &quot;

But would love to find out that there is a command for this.

How to grep the git diff?

I have a shell script in which I need to check whether two files contain the same data or not. I do this a for a lot of files, and in my script the `diff` command seems to be the performance bottleneck. 

Here&#39;s the line:

    diff -q $dst $new &gt; /dev/null

    if ($status) then ...

Could there be a faster way to compare the files, maybe a custom algorithm instead of the default `diff`?

Fastest way to tell if two files have the same contents in Unix/Linux?

This answer is great for seeing a visual diff between two files that are checked into git:
https://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-a-visual-diff-program/949242#949242 

However, I&#39;d like to see a visual diff between two branches. So far, my best bet seems to be: 

    git diff --name-status master dev

which isn&#39;t very informative and not very visual.

Is there anything better out there?


git visual diff between branches

If I run `git diff` I see the changes in my working tree, and if I run `git diff --staged` (alternatively `--cached`) then I see the changes that are staged (w/ `git add`) but is there a way with `git diff` to see all in one go? 

Show both staged &amp; working tree in git diff?

How to create patch suitable for reviewing in crucible?

    git diff branch master --no-prefix &gt; patch

This generates only 3 lines of context. So I do the following

    git diff --unified=2000 branch master --no-prefix &gt; patch

Hopefully all files will have less than 2000 lines. Is there a way to tell git to include all the lines in the file for patch without having to specify maximum lines?

How to get git diff with full context?

vim-fugitive side-by-side git diff is great for viewing diff of unstaged files.

How can I use vim-fugitive to git diff

 - staged files? 
 - any git revision?

How can I view git diff for any commit using vim-fugitive?

I&#39;m just starting to work with Git.  I would like to use TortoiseMerge as the difftool and mergetool.

In my `$HOME/.gitconfig` I have the following sections. I&#39;ve removed the user and color sections for this question.

    [merge]
    	tool = tortoisemerge
    [mergetool &quot;tortoisemerge&quot;]
    	cmd = \&quot;TortoiseMerge.exe\&quot; -base:\&quot;$BASE\&quot; -mine:\&quot;$LOCAL\&quot; -theirs:\&quot;$REMOTE\&quot; -merged:\&quot;$MERGED\&quot;
    [diff]
    	tool = tortoisemerge
    [difftool &quot;tortoisemerge&quot;]
    	cmd = \&quot;TortoiseMerge.exe\&quot; -base:\&quot;$BASE\&quot; -mine:\&quot;$LOCAL\&quot; -theirs:\&quot;$REMOTE\&quot; -merged:\&quot;$MERGED\&quot;

If I type tortoisemerge at the Git Bash prompt it loads. It is known to be on the path. But if I type the command I get the following error.

    Rich:mygittest (master *)
    $ git difftool
    error: &#39;tortoisemerge&#39; can only be used to resolve merges
    merge tool candidates: kompare emerge vimdiff
    No known merge resolution program available.
    external diff died, stopping at readme.txt.
    Rich:mygittest (master *)
    $ 

What am I not understanding to make this work?
Tortoisemerge is installed with TortoiseSVN.



Can TortoiseMerge be used as a difftool with Windows Git Bash?

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?

Content Type	Original Author	Original Content on Stackoverflow
Question	Wazery	View Question on Stackoverflow
Solution 1 - Git	jolivier	View Answer on Stackoverflow
Solution 2 - Git	Sergiu Dumitriu	View Answer on Stackoverflow

Differences for a certain folder between git branches

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Why doesn't await on Task.WhenAll throw an AggregateException?

How do I assert an Iterable contains elements with a certain property?

Attributions