diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-14 05:56:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-14 05:56:12 (GMT) |
| commit | 4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1 (patch) | |
| tree | de1b32781f7d0781f5999188d3fb07f989fd1345 /git-merge-resolve.sh | |
| parent | 113bc160941c4bcc9211d32f17098ab5a2428fa4 (diff) | |
| parent | bcd57cb9e1583fe5174112422caba0397f7ae5f6 (diff) | |
| download | git-4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1.zip git-4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1.tar.gz git-4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1.tar.bz2 | |
Merge branch 'mr/doc-clean-f-f' into maint
Documentation update.
* mr/doc-clean-f-f:
Documentation/git-clean.txt: document that -f may need to be given twice
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions