diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-07 22:44:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-07 22:44:45 -0700 |
| commit | 11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea (patch) | |
| tree | 1b15bd04ca47863855c045b34dd69728be98a84b /builtin-apply.c | |
| parent | Teach "git diff -p" to locate PHP class methods (diff) | |
| parent | checkout: do not check out unmerged higher stages randomly (diff) | |
| download | tgif-11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea.tar.xz | |
Merge branch 'jc/maint-checkout-fix'
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly
Conflicts:
t/t7201-co.sh
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions