diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:11 -0700 |
| commit | a157400c972bbdeab2b5629658c99839c855f5ab (patch) | |
| tree | 95c9ae9bf86dcc6e2bd4a3b0b217f5bef8622b59 /t/t6027-merge-binary.sh | |
| parent | Merge branch 'rs/alloc-ref' (diff) | |
| parent | Enhance hold_lock_file_for_{update,append}() API (diff) | |
| download | tgif-a157400c972bbdeab2b5629658c99839c855f5ab.tar.xz | |
Merge branch 'jc/maint-co-track'
* jc/maint-co-track:
Enhance hold_lock_file_for_{update,append}() API
demonstrate breakage of detached checkout with symbolic link HEAD
Fix "checkout --track -b newbranch" on detached HEAD
Conflicts:
builtin-commit.c
Diffstat (limited to 't/t6027-merge-binary.sh')
0 files changed, 0 insertions, 0 deletions