diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
| commit | edf9d719d1d05c1eb4f652782febfdfede212648 (patch) | |
| tree | 86e37bca053a0c5c3c99eb1124d97a9ffdb43e05 /Documentation/git-merge-index.txt | |
| parent | grep: read patterns from stdin with -f - (diff) | |
| parent | gitweb: Always call parse_date with timezone parameter (diff) | |
| download | tgif-edf9d719d1d05c1eb4f652782febfdfede212648.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Always call parse_date with timezone parameter
bisect: explain the rationale behind 125
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions