diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:57 -0700 |
| commit | be9d07f520ef10359202492652ee7a6001f7100b (patch) | |
| tree | d51b896109cf6e980a4be6ae382124ad4e9d3f37 /builtin/merge.c | |
| parent | 4fe3ed130201a95212dd18cb3bef104d44ed49c4 (diff) | |
| parent | 1d77d249f9b0605ed21ca751c5dfb8550efcdfa3 (diff) | |
| download | git-be9d07f520ef10359202492652ee7a6001f7100b.tar.gz git-be9d07f520ef10359202492652ee7a6001f7100b.tar.xz | |
Merge branch 'jc/detached-head-doc' into maint
* jc/detached-head-doc:
glossary: extend "detached HEAD" description
Conflicts:
Documentation/glossary-content.txt
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions