diff options
| author | Jeff King <peff@peff.net> | 2012-10-29 09:13:16 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 09:13:16 +0100 |
| commit | e034d1bb927c17a3406a2bdbb8ccf710677a139d (patch) | |
| tree | 58bc69a25324468d97a49aeb942c938211ccd442 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'jk/maint-http-init-not-in-result-handler' (diff) | |
| parent | grep: stop looking at random places for .gitattributes (diff) | |
| download | git-e034d1bb927c17a3406a2bdbb8ccf710677a139d.tar.xz git-e034d1bb927c17a3406a2bdbb8ccf710677a139d.zip | |
Merge branch 'nd/grep-true-path'
"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.
* nd/grep-true-path:
grep: stop looking at random places for .gitattributes
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions