diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 21:58:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 21:58:07 +0400 |
| commit | 8617715cc09b7422fe31189f9476f6ade73ede70 (patch) | |
| tree | 7c62d215a31c9e990753b2bc1e8aee1870f06c4c /gpg-interface.h | |
| parent | ccf23370aacf01111eebdee196da10d4e61a6be4 (diff) | |
| parent | 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 (diff) | |
Merge branch 'maint'
* maint:
More fixes for 1.8.2.1
merge-tree: fix typo in merge-tree.c::unresolved
git-commit doc: describe use of multiple `-m` options
git-pull doc: fix grammo ("conflicts" is plural)
Diffstat (limited to 'gpg-interface.h')
0 files changed, 0 insertions, 0 deletions