summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-29 08:13:16 (GMT)
committerJeff King <peff@peff.net>2012-10-29 08:13:16 (GMT)
commite034d1bb927c17a3406a2bdbb8ccf710677a139d (patch)
tree58bc69a25324468d97a49aeb942c938211ccd442 /resolve-undo.c
parent58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c (diff)
parent55c61688ea1e41f4a8c26f957bf1bc43cd39ed97 (diff)
downloadgit-e034d1bb927c17a3406a2bdbb8ccf710677a139d.zip
git-e034d1bb927c17a3406a2bdbb8ccf710677a139d.tar.gz
git-e034d1bb927c17a3406a2bdbb8ccf710677a139d.tar.bz2
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions