diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-04 18:40:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-04 18:40:41 -0700 |
| commit | dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c (patch) | |
| tree | d3f094e8c3d559f6efdeca927b613c8535cb7699 /git-merge-octopus.sh | |
| parent | Git 1.7.7 (diff) | |
| parent | grep: teach --untracked and --exclude-standard options (diff) | |
| download | tgif-dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c.tar.xz | |
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
* jc/maint-grep-untracked-exclude:
grep: teach --untracked and --exclude-standard options
grep --no-index: don't use git standard exclusions
grep: do not use --index in the short usage output
Conflicts:
Documentation/git-grep.txt
builtin/grep.c
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions