diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:56:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:56:27 -0700 |
| commit | b966427b53b246e722df1e5502b9145eb9dd063a (patch) | |
| tree | 64df791944fd20ba8c49dc5043aa25681f07e1c7 /Documentation/git-merge.txt | |
| parent | 6c80cd298a9f2f36ae4e741cf65d94b7c184fb82 (diff) | |
| parent | b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3 (diff) | |
| download | git-b966427b53b246e722df1e5502b9145eb9dd063a.tar.gz | |
Merge branch 'jr/grep-en-config'
* jr/grep-en-config:
grep: allow -E and -n to be turned on by default via configuration
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions