diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-04 16:30:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-04 16:30:00 -0800 |
| commit | ba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch) | |
| tree | cee119a3eccf55b60a44fe29974fb108cd527739 /xdiff | |
| parent | git-fetch: ignore dereferenced tags in expand_refs_wildcard (diff) | |
| parent | receive-pack: do not insist on fast-forward outside refs/heads/ (diff) | |
| download | tgif-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.xz | |
Merge branch 'maint'
* maint:
receive-pack: do not insist on fast-forward outside refs/heads/
git-mv: search more precisely for source directory in index
Conflicts:
receive-pack.c
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions