diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-18 15:35:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 15:35:01 -0800 |
| commit | 252f922b1919db3bcfdc07bbedff7d3c42172959 (patch) | |
| tree | b85686e7a601ddffbe9f43a6b824dadaf77220bc /git-merge-octopus.sh | |
| parent | Sync with 'maint' (diff) | |
| parent | t7004: do not create unneeded gpghome/gpg.conf when GPG is not used (diff) | |
| download | tgif-252f922b1919db3bcfdc07bbedff7d3c42172959.tar.xz | |
Merge branch 'maint'
* maint:
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions