diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-07 15:40:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-07 15:40:21 -0800 |
| commit | 3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33 (patch) | |
| tree | 4e39d2295155392349986d5ae49fa6506e960560 /git-gui | |
| parent | 0ad6f1a988312ebc2733126cf17f694d7008659f (diff) | |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 (diff) | |
| download | git-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.tar.gz git-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.tar.xz | |
Merge branch 'sb/maint-octopus'
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions