diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:10:17 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | f07df52489c78c33c5c5c1bd973038283c401582 (patch) | |
| tree | a575b81623a2766dce1188e37dd76d45e92c4804 /Documentation/technical/api-tree-walking.txt | |
| parent | merge script: handle many-way octopus (diff) | |
| download | tgif-f07df52489c78c33c5c5c1bd973038283c401582.tar.xz | |
merge script: --ff-only to disallow true merge
Port v1.6.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option
--ff-only, 2009-10-29) to the old merge script.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-tree-walking.txt')
0 files changed, 0 insertions, 0 deletions