diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-05 18:56:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-05 18:56:53 (GMT) |
| commit | ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37 (patch) | |
| tree | 7b8f807cb10afdb7e94e090f7bedc3e7faf36429 /git-merge-resolve.sh | |
| parent | 16adc7cb048f9c31e80b4409aa599d485595c4e0 (diff) | |
| parent | 6b097788f88a29d6e171af7a9e87117cf992e833 (diff) | |
| download | git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.zip git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.gz git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.bz2 | |
Merge branch 'maint'
* maint:
t0006: test timezone parsing
rerere.txt: Document forget subcommand
Documentation/git-gc.txt: add reference to githooks
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions