diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-22 20:38:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-22 20:38:02 -0800 |
| commit | a7b5e9141ea50ed8f85379a53e550008dff2bda2 (patch) | |
| tree | 21ed7a8bdb7798b824f858265f34a5f421e47a32 /t/t3309-notes-merge-auto-resolve.sh | |
| parent | Merge branch 'ta/api-index-doc' into maint (diff) | |
| parent | Documentation/git-checkout.txt: document 70c9ac2 behavior (diff) | |
| download | tgif-a7b5e9141ea50ed8f85379a53e550008dff2bda2.tar.xz | |
Merge branch 'cr/doc-checkout-branch' into maint
* cr/doc-checkout-branch:
Documentation/git-checkout.txt: document 70c9ac2 behavior
Documentation/git-checkout.txt: clarify usage
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions