diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-01 00:06:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-01 00:06:11 -0800 |
| commit | 153559a964f436aeb909e3b7e86ceaa998aeed68 (patch) | |
| tree | a6f3e2ea703d3899a0447ec2610b8d3a73d7a4dd /environment.c | |
| parent | 4b683658be0bd21eac7243bac6fb083e1cc00060 (diff) | |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 (diff) | |
| download | git-153559a964f436aeb909e3b7e86ceaa998aeed68.tar.gz git-153559a964f436aeb909e3b7e86ceaa998aeed68.tar.xz | |
Merge branch 'sb/maint-octopus' into maint-1.6.5
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Diffstat (limited to 'environment.c')
0 files changed, 0 insertions, 0 deletions