diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:26 -0700 |
| commit | 51d5980ea019a28b38d2f9612314daf3ea536e82 (patch) | |
| tree | e8be8ca660b3e9ce704a078d3ef4192b5ec38bc5 /Documentation/git-merge.txt | |
| parent | Merge branch 'es/osx-header-pollutes-mask-macro' into maint (diff) | |
| parent | git-prompt.sh: document GIT_PS1_STATESEPARATOR (diff) | |
| download | tgif-51d5980ea019a28b38d2f9612314daf3ea536e82.tar.xz | |
Merge branch 'jc/prompt-document-ps1-state-separator' into maint
Docfix.
* jc/prompt-document-ps1-state-separator:
git-prompt.sh: document GIT_PS1_STATESEPARATOR
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions