diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-07 22:45:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-07 22:45:25 (GMT) |
| commit | 84da035f3862b72d103d21104a1f67b003d17ebb (patch) | |
| tree | 74ff67c8a196b67f9d0160c7174e37ac3922a98a /git-merge-octopus.sh | |
| parent | dc49cd769b5fa6b7e0114b051c34a849828a7603 (diff) | |
| parent | ef203f08564c1c6d267fedf8e0357c56d477892f (diff) | |
| download | git-84da035f3862b72d103d21104a1f67b003d17ebb.zip git-84da035f3862b72d103d21104a1f67b003d17ebb.tar.gz git-84da035f3862b72d103d21104a1f67b003d17ebb.tar.bz2 | |
Merge branch 'maint'
* maint:
Catch write_ref_sha1 failure in receive-pack
make t8001 work on Mac OS X again
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions