diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-01 12:47:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-01 12:47:04 -0800 |
| commit | 32ef08f4e5ab6ce8f3b47201f1df46d1a33deb80 (patch) | |
| tree | 12a4265c7ef9c801e5ec882fe8a807c86173d3a5 /git-merge-resolve.sh | |
| parent | 36a83f375bc247a09f46de0445a138d5e6de8a4f (diff) | |
| parent | af6fbf9f814b3ee23b4b6d632131095c0278ae44 (diff) | |
| download | git-32ef08f4e5ab6ce8f3b47201f1df46d1a33deb80.tar.gz git-32ef08f4e5ab6ce8f3b47201f1df46d1a33deb80.tar.xz | |
Merge branch 'maint'
* maint:
help: Do not unnecessarily look for a repository
Documentation: Fix a few i.e./e.g. mix-ups
Documentation: Document --branch option in git clone synopsis
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions