diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-08 21:54:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-08 21:54:10 -0800 |
| commit | 105a6339d8454d3856099f6ccea14435a05e2268 (patch) | |
| tree | ae998ef88c0b1cd495c1fd354902e6d9a74e8974 /git-merge-resolve.sh | |
| parent | 720c9f7bda20d8f307745772374647c1a2076b3d (diff) | |
| parent | e33cc592deae8132936eea119554799e1039bc0f (diff) | |
| download | git-105a6339d8454d3856099f6ccea14435a05e2268.tar.gz | |
Merge branch 'maint'
* maint:
blame: prevent a segv when -L given start > EOF
git-push: document all the status flags used in the output
Fix parsing of imap.preformattedHTML and imap.sslverify
git-add documentation: Fix shell quoting example
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions