That may be addressed by the **pickaxe** (`-S`) option of [`gitlog`][1]

     git log -SFoo -- path_containing_change

(you can even add a time range: `--since=2009.1.1 --until=2010.1.1`)

    -S&lt;string&gt;

&gt; Look for differences that introduce or remove an instance of `&lt;string&gt;`.  
Note that this is different than the string simply appearing in diff output; see the pickaxe entry in [gitdiffcore(7)][2] for more details.

    diffcore-pickaxe

&gt; This transformation is used to find filepairs that represent changes that touch a specified string.  
&gt; When `diffcore-pickaxe` is in use, it checks if there are filepairs whose &quot;original&quot; side has the specified string and whose &quot;result&quot; side does not.  
Such a filepair represents &quot;the string appeared in this changeset&quot;.  
It also checks for the opposite case that loses the specified string.

-----

Update 2014:

Since then, you can do (from [nilbus][3]&#39;s [answer][4]):

    git log -p --all -S &#39;search string&#39;
    git log -p --all -G &#39;match regular expression&#39;

&gt; These log commands list commits that add or remove the given search string/regex, (generally) more recent first.  
The `-p` (`--patch`) option causes the relevant diff to be shown where the pattern was added or removed, so you can see it in context.

&gt; Having found a relevant commit that adds the text you were looking for (eg. `8beeff00d`), find the branches that contain the commit:

    git branch -a --contains 8beeff00d

(I reference that last command in &quot;[How to list branches that contain a given commit?][5]&quot;)


  [1]: http://git-scm.com/docs/git-log
  [2]: http://www.kernel.org/pub/software/scm/git/docs/gitdiffcore.html
  [3]: https://stackoverflow.com/users/87298/nilbus
  [4]: https://stackoverflow.com/a/26226807/6309
  [5]: https://stackoverflow.com/a/1419637/6309

Worst case scenario, use [`git bisect`][1] and `grep`?


  [1]: http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html

I want to call a PHP file that starts like

    &lt;?php
    function connection () {
       //Statements
    }

I call from the PHP like this:

    &lt;?php
    exec (&#39;/opt/lampp/htdocs/stuff/name.php&#39;);
    ?&gt;

I get: 

    line1-&gt; cannot open ?: No such file
    line 3 //Connection: not found
    line 4 Syntax errror: &quot;(&quot;

Why doesn&#39;t this correctly execute the name.php file?

Execute php file from another php

I really appreciate Moq&#39;s `Loose` mocking behaviour that returns default values when no expectations are set. It&#39;s convenient and saves me code, and it also acts as a safety measure: dependencies won&#39;t get unintentionally called during the unit test (as long as they are virtual).

However, I&#39;m confused about how to keep these benefits when the method under test happens to be virtual.  
In this case I *do* want to call the real code for that one method, while still having the rest of the class loosely mocked.

All I have found in my searching is that I could set `mock.CallBase = true` to ensure that the method gets called. However, that affects the whole class. I don&#39;t want to do that because it puts me in a dilemma about all the other properties and methods in the class that hide call dependencies: if CallBase is true then I have to either

 1. Setup stubs for all of the properties and methods that hide dependencies -- Even though my test doesn&#39;t think it needs to care about those dependencies, or
 2. Hope that I don&#39;t forget to Setup any stubs (and that no new dependencies get added to the code in the future) -- Risk unit tests hitting a real dependency.

What I think I want is something like:  
`mock.Setup(m =&gt; m.VirtualMethod()).CallBase();`  
so that when I call `mock.Object.VirtualMethod()`, Moq calls into the real implementation...


**Q: With Moq, is there any way to test a virtual method, when I mocked the class to stub just a few dependencies? I.e. Without resorting to *CallBase=true* and having to stub all of the dependencies?**


---

*Example code to illustrate*  
   *(uses MSTest, InternalsVisibleTo DynamicProxyGenAssembly2)*

In the following example, `TestNonVirtualMethod` passes, but `TestVirtualMethod` fails - returns null.


    public class Foo
    {
        public string NonVirtualMethod() { return GetDependencyA(); }
        public virtual string VirtualMethod() { return GetDependencyA();}

        internal virtual string GetDependencyA() { return &quot;! Hit REAL Dependency A !&quot;; }
        // [... Possibly many other dependencies ...]
        internal virtual string GetDependencyN() { return &quot;! Hit REAL Dependency N !&quot;; }
    }

    [TestClass]
    public class UnitTest1
    {
        [TestMethod]
        public void TestNonVirtualMethod()
        {
            var mockFoo = new Mock&lt;Foo&gt;();
            mockFoo.Setup(m =&gt; m.GetDependencyA()).Returns(expectedResultString);

            string result = mockFoo.Object.NonVirtualMethod();

            Assert.AreEqual(expectedResultString, result);
        }

        [TestMethod]
        public void TestVirtualMethod() // Fails
        {
            var mockFoo = new Mock&lt;Foo&gt;();
            mockFoo.Setup(m =&gt; m.GetDependencyA()).Returns(expectedResultString);
            // (I don&#39;t want to setup GetDependencyB ... GetDependencyN here)

            string result = mockFoo.Object.VirtualMethod();

            Assert.AreEqual(expectedResultString, result);
        }

        string expectedResultString = &quot;Hit mock dependency A - OK&quot;;
    }


When mocking a class with Moq, how can I CallBase for just specific methods?

I had somewhere in my Git repository a line containing the word &quot;Foo&quot; a couple of hundreds of commits before.

If there is any way to find its revision number where it was the last time?

Git history - find lost line by keyword

<p>I had somewhere in my Git repository a line containing the word "Foo" a couple of hundreds of commits before.</p>
<p>If there is any way to find its revision number where it was the last time?</p>


I did a `git stash pop` and ended up with merge conflicts. I removed the files from the file system and did a `git checkout` as shown below, but it thinks the files are still unmerged. I then tried replacing the files and doing a `git checkout` again and same result. I event tried forcing it with `-f` flag. Any help would be appreciated!

    chirag-patels-macbook-pro:haloror patelc75$ git status
    app/views/layouts/_choose_patient.html.erb: needs merge
    app/views/layouts/_links.html.erb: needs merge
    # On branch prod-temp
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #
    #       modified:   db/schema.rb
    #
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       unmerged:   app/views/layouts/_choose_patient.html.erb
    #       unmerged:   app/views/layouts/_links.html.erb
    
    chirag-patels-macbook-pro:haloror patelc75$ git checkout app/views/layouts/_choose_patient.html.erb
    error: path &#39;app/views/layouts/_choose_patient.html.erb&#39; is unmerged
    chirag-patels-macbook-pro:haloror patelc75$ git checkout -f app/views/layouts/_choose_patient.html.erb
    warning: path &#39;app/views/layouts/_choose_patient.html.erb&#39; is unmerged

git stash blunder: git stash pop and ended up with merge conflicts

How can I uncommit my last commit in git?

Is it

    git reset --hard HEAD

or

    git reset --hard HEAD^

?


How to uncommit my last commit in Git

Coming from mercurial, I use branches to organize features.
Naturally, I want to see this work-flow in my history as well.

I started my new project using git and finished my first feature. When merging the feature, I realized git uses fast-forward, i.e. it applies my changes directly to the master branch if possible and forgets about my branch.

So to think into the future: I&#39;m the only one working on this project. If I use git&#39;s default approach (fast-forward merging), my history would result in one giant master branch.
Nobody knows I used a separate branch for every feature, because in the end I&#39;ll have only that giant master branch. Won&#39;t that look unprofessional?

By this reasoning, I don&#39;t want fast-forward merging and can&#39;t see why it is the default. What&#39;s so good about it?

Why does git perform fast-forward merges by default?

How do I recursively add files by a pattern (or glob) located in different directories?

For example, I&#39;d like to add `A/B/C/foo.java` and `D/E/F/bar.java` (and several other java files) with one command:

    git add &#39;*.java&#39;

Unfortunately, that doesn&#39;t work as expected.

Recursively add files by pattern

I understand how to create aliases in PowerShell for cmdlets fine, but I want to create an alias in PowerShell for things like `git status` as just `gs`, and `git pull origin master` as `gpm`. Can anyone point me in the right direction?

Creating aliases in PowerShell for git commands?

I have a file with database settings in my project which I have set to some defaults. The file is tracked by Mercurial and checked in. Since this file will be edited with different values various developer machines, is there a way I can tell Mercurial to ignore new changes to this file?

I tried adding the file to the `.hgignore` file, but since the file is tracked it isn&#39;t ignored. This is alright and good in other situations, but I am wondering if there is something I can do here?

Mercurial: How to ignore changes to a tracked file

What is the difference between `git pull origin master` and `git pull origin/master` ?

Differences between git pull origin master &amp; git pull origin/master

If you do `git log --patch -- path/to/file`, you will get the history of the file along with a diff of all the changes made to it with each commit, like this:

    $ git log --patch -- git-rebase.sh

    commit 20351bb06bf4d32ef3d1a6849d01636f6593339f
    Author: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
    Date:   Sat Jun 15 18:43:26 2013 +0530

        rebase: use &#39;git stash store&#39; to simplify logic

        rebase has no reason to know about the implementation of the stash.  In
        the case when applying the autostash results in conflicts, replace the
        relevant code in finish_rebase () to simply call &#39;git stash store&#39;.

        Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
        Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;

    diff --git a/git-rebase.sh b/git-rebase.sh
    index d0c11a9..17be392 100755
    --- a/git-rebase.sh
    +++ b/git-rebase.sh
    @@ -153,11 +153,8 @@ finish_rebase () {
                    then
                            echo &quot;$(gettext &#39;Applied autostash.&#39;)&quot;
                    else
    -                       ref_stash=refs/stash &amp;&amp;
    -                       &gt;&gt;&quot;$GIT_DIR/logs/$ref_stash&quot; &amp;&amp;
    -                       git update-ref -m &quot;autostash&quot; $ref_stash $stash_sha1 ||
    -                       die &quot;$(eval_gettext &#39;Cannot store $stash_sha1&#39;)&quot;
    -
    +                       git stash store -m &quot;autostash&quot; -q $stash_sha1 ||
    +                       die &quot;$(eval_gettext &quot;Cannot store \$stash_sha1&quot;)&quot;
                            gettext &#39;Applying autostash resulted in conflicts.
     Your changes are safe in the stash.
     You can run &quot;git stash pop&quot; or &quot;git stash drop&quot; it at any time.

    commit 2e6e276decde2a9f04fc29bce734a49d3ba8f484
    Author: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
    Date:   Fri Jun 14 18:47:52 2013 +0530

        rebase: use peel_committish() where appropriate

        The revisions specified on the command-line as &lt;onto&gt; and &lt;upstream&gt;
        arguments could be of the form :/quuxery; so, use peel_committish() to
        resolve them.  The failing tests in t/rebase and t/rebase-interactive
        now pass.

        Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
        Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;

    diff --git a/git-rebase.sh b/git-rebase.sh
    index d0c11a9..6987b9b 100755
    --- a/git-rebase.sh
    +++ b/git-rebase.sh
    @@ -434,7 +434,7 @@ then
                    shift
                    ;;
            esac
    -       upstream=`git rev-parse --verify &quot;${upstream_name}^0&quot;` ||
    +       upstream=$(peel_committish &quot;${upstream_name}&quot;) ||
            die &quot;$(eval_gettext &quot;invalid upstream \$upstream_name&quot;)&quot;
            upstream_arg=&quot;$upstream_name&quot;
     else
    @@ -470,7 +470,7 @@ case &quot;$onto_name&quot; in
            fi
            ;;
     *)
    -       onto=$(git rev-parse --verify &quot;${onto_name}^0&quot;) ||
    +       onto=$(peel_committish &quot;$onto_name&quot;) ||
            die &quot;$(eval_gettext &quot;Does not point to a valid commit: \$onto_name&quot;)&quot;
            ;;
     esac

I want to be able to get the same kind of format **using GitHub&#39;s web interface (not the command line)**, and I want a link to send to someone else without the code.

Can GitHub show the history of changes made to one file in patch form?

Our project uses Git as the version control system and recently I needed to review someone&#39;s commits. How can I see a list of commits made by a specific user?

How to find commits by a specific user in Git?

I&#39;ve always programmed alone, I&#39;m still a student so I never programmed with anyone else, I haven&#39;t even used a version control system before.

I&#39;m working on a project now that requires knowledge of how programmers work together on a piece of software in a company.

How is the software compiled? Is it from the version control system? Is it by individual programmers? Is it periodic? Is it when someone decides to build or something? Are there any tests that are done to make sure it &quot;works&quot;?

Anything will do.

Content Type	Original Author	Original Content on Stackoverflow
Question	Nikita Fedyashev	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	Amber	View Answer on Stackoverflow

Git history - find lost line by keyword

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

When mocking a class with Moq, how can I CallBase for just specific methods?

Execute php file from another php

Attributions