Jump to content
Toggle sidebar
FreeCAD Documentation
Search
English
Log in
Personal tools
Log in
Index
Overview
Features
Screenshots
Download
FAQ
Forum
Tracker
General usage
User Hub
Manual
Tutorials
Installing
Getting started
Navigation styles
Customizing FreeCAD
Commands list
Workbenches
Workbenches list
Arch
Assembly
CAM/Path
Draft
FEM
Mesh
OpenSCAD
Part
PartDesign
Points
Robot
Sketcher
Spreadsheet
Surface
TechDraw
External workbenches
Python scripting
Powerusers hub
Discovering Python
Python in FreeCAD
Macros
Mesh scripting
Part scripting
Pivy
PySide
Parametric objects
Code examples
Python API
Development
Developers hub
How to contribute
Git repository
Compiling
License details
Organization chart
Startup options
Branding
Translating
Help & Feedback
Forum
Bugs tracker
IRC channel
Facebook
Twitter
Mastodon
Meta
Recent changes
Random page
Links
Tools
Special pages
Printable version
Export translations
Translate
English
Language statistics
Message group statistics
Export
More
Language statistics
Message group statistics
Export
Settings
Group
3D input devices
3D view
3Dconnexion input devices
A2plus Workbench
About FreeCAD
Add Button to FEM Toolbar Tutorial
Add FEM Constraint Tutorial
Add FEM Equation Tutorial
Add Workbench to Addon Manager
Addon
Advanced Attachment OYX
Advanced TechDraw Tutorial
Aeroplane
Analysis of reinforced concrete with FEM
Animation Workbench
ANSI templates
App DocumentObject
App DocumentObjectGroup
App FeaturePython
App GeoFeature
App Link
App OriginGroupExtension
App Part
AppImage
Arch 3DS
Arch 3Views
Arch Add
Arch API
Arch Axis
Arch AxisSystem
Arch Building
Arch BuildingPart
Arch Check
Arch CloneComponent
Arch CloseHoles
Arch CompAxis
Arch Component
Arch CompPanel
Arch CompPipe
Arch CompRebarStraight
Arch CompSetMaterial
Arch CurtainWall
Arch CutLine
Arch CutPlane
Arch DAE
Arch Door
Arch Equipment
Arch Fence
Arch Floor
Arch Frame
Arch Grid
Arch IFC
Arch IfcExplorer
Arch IfcSpreadsheet
Arch JSON
Arch MergeWalls
Arch MeshToShape
Arch MultiMaterial
Arch Nest
Arch OBJ
Arch Panel
Arch Panel Cut
Arch Panel Sheet
Arch panel tutorial
Arch Pipe
Arch PipeConnector
Arch Preferences
Arch Profile
Arch Project
Arch Rebar
Arch Reference
Arch Remove
Arch RemoveShape
Arch Roof
Arch Schedule
Arch SectionPlane
Arch SelectNonSolidMeshes
Arch SetMaterial
Arch SHP
Arch Site
Arch Space
Arch SplitMesh
Arch Stairs
Arch Structure
Arch Survey
Arch templates
Arch ToggleIfcBrepFlag
Arch ToggleSubs
Arch Truss
Arch tutorial
Arch Wall
Arch Window
Arch Workbench
Artwork
Artwork Arch
Artwork Assembly
Artwork Assembly3
Artwork CAM
Artwork Draft
Artwork Fem
Artwork Gui
Artwork Guidelines
Artwork Inspection
Artwork Material
Artwork Mesh
Artwork MeshPart
Artwork OpenSCAD
Artwork Part
Artwork PartDesign
Artwork Plot
Artwork Points
Artwork Reinforcement
Artwork Render
Artwork ReverseEngineering
Artwork Robot
Artwork Ship
Artwork Sketcher
Artwork Splash screen
Artwork Spreadsheet
Artwork Start
Artwork Surface
Artwork TechDraw
Artwork Test
Artwork Tux
Artwork Web
Assembly
Assembly Workbench
Assembly2 Workbench
Assembly3 AddOrigin
Assembly3 AddPlacement
Assembly3 AddWorkplane
Assembly3 AddXZWorkplane
Assembly3 AddZYWorkplane
Assembly3 AutoElementVisibility
Assembly3 AutoFixElement
Assembly3 AutoRecompute
Assembly3 AxialMove
Assembly3 ConstraintAlignment
Assembly3 ConstraintAngle
Assembly3 ConstraintArcLineTangent
Assembly3 ConstraintAttachment
Assembly3 ConstraintAttachmentOffset
Assembly3 ConstraintAxial
Assembly3 ConstraintCoincidence
Assembly3 ConstraintColinear
Assembly3 ConstraintDiameter
Assembly3 ConstraintEqualAngle
Assembly3 ConstraintEqualLength
Assembly3 ConstraintEqualLineArcLength
Assembly3 ConstraintEqualPointLineDistance
Assembly3 ConstraintEqualRadius
Assembly3 ConstraintLengthDifference
Assembly3 ConstraintLengthEqualPointLineDistance
Assembly3 ConstraintLengthRatio
Assembly3 ConstraintLineHorizontal
Assembly3 ConstraintLineLength
Assembly3 ConstraintLineVertical
Assembly3 ConstraintLock
Assembly3 ConstraintMidPoint
Assembly3 ConstraintMore
Assembly3 ConstraintMultiParallel
Assembly3 ConstraintPerpendicular
Assembly3 ConstraintPointDistance
Assembly3 ConstraintPointInPlane
Assembly3 ConstraintPointLineDistance
Assembly3 ConstraintPointOnCircle
Assembly3 ConstraintPointOnLine
Assembly3 ConstraintPointPlaneDistance
Assembly3 ConstraintPointsCoincident
Assembly3 ConstraintPointsDistance
Assembly3 ConstraintPointsHorizontal
Assembly3 ConstraintPointsProjectDistance
Assembly3 ConstraintPointsSymmetric
Assembly3 ConstraintPointsVertical
Assembly3 ConstraintSameOrientation
Assembly3 ConstraintSketchPlane
Assembly3 ConstraintSymmetric
Assembly3 ConstraintSymmetricHorizontal
Assembly3 ConstraintSymmetricLine
Assembly3 ConstraintSymmetricVertical
Assembly3 CreateAssembly
Assembly3 CreateElement
Assembly3 GoToRelation
Assembly3 GroupObjects
Assembly3 ImportFromSTEP
Assembly3 ImportMultiDocument
Assembly3 LockMover
Assembly3 MeasureAngle
Assembly3 MeasurePointLine
Assembly3 MeasurePointPlane
Assembly3 MeasurePoints
Assembly3 MoveItemDown
Assembly3 MoveItemUp
Assembly3 MovePart
Assembly3 MultiplyConstraint
Assembly3 QuickMove
Assembly3 QuickSolve
Assembly3 ResolveConstraints
Assembly3 ShowElementCS
Assembly3 SmartRecompute
Assembly3 TogglePartVisibility
Assembly3 TracePartMove
Assembly3 Workbench
Assembly4 Workbench
Asymptote
B-Splines
Base API
Basic Attachment Tutorial
Basic modeling tutorial
Basic Part Design Tutorial
Basic Part Design Tutorial 019
Basic Sketcher Tutorial
Basic TechDraw Tutorial
BIM application compatibility table
BIM Box
BIM Classification
BIM Clone
BIM Copy
BIM IfcElements
BIM IfcProperties
BIM IfcQuantities
BIM ingame tutorial
BIM Layers
BIM Library
BIM Preflight
BIM Project
BIM Setup
BIM Views
BIM Windows
BIM Workbench
Bitmap
Body
BOLTSFC Workbench
Books
Branding
Builtin modules
CadQuery Workbench
CAM Adaptive
CAM Area
CAM Area Workplane
CAM Array
CAM Comment
CAM Copy
CAM Custom
CAM Deburr
CAM DressupAxisMap
CAM DressupDogbone
CAM DressupDragKnife
CAM DressupLeadInOut
CAM DressupPathBoundary
CAM DressupRampEntry
CAM DressupTag
CAM DressupZCorrect
CAM Drilling
CAM Engrave
CAM experimental
CAM ExportTemplate
CAM FAQ
CAM Fixture
CAM fourth axis
CAM Helix
CAM Inspect
CAM Job
CAM MillFace
CAM OpActiveToggle
CAM Pocket 3D
CAM Pocket Shape
CAM Post
CAM Postprocessor Customization
CAM Preferences
CAM Probe
CAM Profile
CAM Sanity
CAM scripting
CAM SelectLoop
CAM SetupSheet
CAM Shape
CAM SimpleCopy
CAM Simulator
CAM Slot
CAM Stop
CAM Surface
CAM ThreadMilling
CAM ToolBit
CAM ToolBit Library
CAM ToolBitDock
CAM ToolBitLibraryOpen
CAM ToolController
CAM Tools
CAM ToolShape
CAM Vcarve
CAM Walkthrough for the Impatient
CAM Waterline
CAM Workbench
Cfd Workbench
Changelog
Civil Engineering Workbench
Code snippets
Coin3d snippets
Combo view
Command
Common Airfoil Data Import
Compile on Docker
Compile on Linux
Compile on MacOS
Compile on MinGW
Compile on Windows
CompileOnWindows - Reducing Disk Footprint
Compiling
Compiling (Speeding up)
Conda
Console API
Constraint
Constructive solid geometry
Continuous Integration
Contributors
Copying Objects
Create a FeaturePython object part I
Create a FeaturePython object part II
Creating a simple part with Draft and Part WB
Creating a simple part with Part WB
Creating a simple part with PartDesign
Crowdin Administration
Crowdin Scripts
CurvedShapes CurvedArray
CurvedShapes Workbench
Curves CompressionSpring
Curves Discretize
Curves EditableSpline
Curves ExtendCurve
Curves GordonSurface
Curves Interpolate
Curves IsoCurve
Curves JoinCurve
Curves Line
Curves MultiLoft
Curves ParametricComb
Curves ParametricSolid
Curves PasteSVG
Curves Pipeshell
Curves PipeshellProfile
Curves ProfileSupport
Curves ReflectLines
Curves SegmentSurface
Curves SketchOnSurface
Curves SplitCurve
Curves ToConsole
Curves Workbench
Curves ZebraTool
Custom icon in tree view
Customize Toolbars
DAG view
Datum
Debian development
Debian Unstable
Debugging
Defeaturing
Defeaturing Workbench
Developer hub
Developing FreeCAD with GitKraken
Developing FreeCAD with KDevelop
Development roadmap
Dialog creation
Dialog creation image and animated GIF
Dialog creation reading and writing files
Dialog creation setting colors
Dialog creation with various widgets
Document structure
Donate
Download
Doxygen
Draft AddConstruction
Draft AddNamedGroup
Draft AddToGroup
Draft annotation scale widget
Draft AnnotationStyleEditor
Draft API
Draft ApplyStyle
Draft Arc
Draft Arc 3Points
Draft Array
Draft AutoGroup
Draft BezCurve
Draft BSpline
Draft Circle
Draft CircularArray
Draft Clone
Draft Constrain
Draft CubicBezCurve
Draft DAT
Draft Dimension
Draft Downgrade
Draft Draft2Sketch
Draft Drawing
Draft DXF
Draft Edit
Draft Ellipse
Draft Facebinder
Draft Fillet
Draft FlipDimension
Draft Hatch
Draft Heal
Draft Join
Draft Label
Draft Layer
Draft LayerManager
Draft Line
Draft Mirror
Draft Move
Draft OCA
Draft Offset
Draft OrthoArray
Draft PathArray
Draft PathLinkArray
Draft Pattern
Draft Point
Draft PointArray
Draft PointLinkArray
Draft PolarArray
Draft Polygon
Draft Preferences
Draft Rectangle
Draft Rotate
Draft Scale
Draft SelectGroup
Draft SelectPlane
Draft SetStyle
Draft Shape2DView
Draft ShapeString
Draft ShapeString tutorial
Draft ShowSnapBar
Draft Slope
Draft Snap
Draft Snap Angle
Draft Snap Center
Draft Snap Dimensions
Draft Snap Endpoint
Draft Snap Extension
Draft Snap Grid
Draft Snap Intersection
Draft Snap Lock
Draft Snap Midpoint
Draft Snap Near
Draft Snap Ortho
Draft Snap Parallel
Draft Snap Perpendicular
Draft Snap Special
Draft snap widget
Draft Snap WorkingPlane
Draft Split
Draft Stretch
Draft SubelementHighlight
Draft SVG
Draft Text
Draft ToggleConstructionMode
Draft ToggleContinueMode
Draft ToggleDisplayMode
Draft ToggleGrid
Draft Tray
Draft Trimex
Draft tutorial
Draft Upgrade
Draft Wire
Draft WireToBSpline
Draft Workbench
Draft WorkingPlaneProxy
Drawing
Drawing Annotation
Drawing API example
Drawing Clip
Drawing Dimensioning Addon
Drawing Documentation
Drawing Landscape A3
Drawing Open SVG
Drawing Openbrowser
Drawing Orthoviews
Drawing ProjectShape
Drawing Save
Drawing SpreadsheetView
Drawing Symbol
Drawing Template HowTo
Drawing templates
Drawing tutorial
Drawing View
Drawing Workbench
DXF
DynamicData Workbench
EM FHEquiv
EM FHInputFile
EM FHNode
EM FHPath
EM FHPlane
EM FHPlaneAddRemoveNodeHole
EM FHPlaneHole
EM FHPort
EM FHSegment
EM FHSolver
EM Workbench
Embedding FreeCAD
Embedding FreeCADGui
Engine Block Tutorial
Example Combined Footing
Example Slab Having LShape Rebars Reinforcement Mesh
Example Slab Having Mesh Of Straight Rebars
Example Slab Having UShape Rebars Reinforcement Mesh
Example Slab Spanning in One Direction
Example Slab Spanning in Two Directions
ExplodedAssembly Workbench
Export to STL or OBJ
Expressions
Extend FEM Module
External workbenches
Extra python modules
Fasteners BOM
Fasteners ChamferHole
Fasteners ChangeParameters
Fasteners Flip
Fasteners MatchTypeInner
Fasteners MatchTypeOuter
Fasteners Move
Fasteners ScrewCalculator
Fasteners Simplify
Fasteners Workbench
FCGear BevelGear
FCGear CrownGear
FCGear CycloidGear
FCGear CycloidRack
FCGear GearConnector
FCGear HypoCycloidGear
FCGear InternalInvoluteGear
FCGear InvoluteGear
FCGear InvoluteRack
FCGear LanternGear
FCGear TimingGear
FCGear Workbench
FCGear WormGear
Fcmcua Workbench
Feature
Feature editing
Feature list
FeaturePython Custom Properties
FeaturePython methods
FEM Analysis
FEM CalculiX
FEM CalculiX Cantilever 3D
FEM ClippingPlaneAdd
FEM ClippingPlaneRemoveAll
FEM Concrete
FEM ConstantVacuumPermittivity
FEM ConstraintBearing
FEM ConstraintBodyHeatSource
FEM ConstraintCentrif
FEM ConstraintContact
FEM ConstraintCurrentDensity
FEM ConstraintDisplacement
FEM ConstraintElectrostaticPotential
FEM ConstraintFixed
FEM ConstraintFlowVelocity
FEM ConstraintFluidBoundary
FEM ConstraintForce
FEM ConstraintGear
FEM ConstraintHeatflux
FEM ConstraintInitialFlowVelocity
FEM ConstraintInitialPressure
FEM ConstraintInitialTemperature
FEM ConstraintMagnetization
FEM ConstraintPlaneRotation
FEM ConstraintPressure
FEM ConstraintPulley
FEM ConstraintSectionPrint
FEM ConstraintSelfWeight
FEM ConstraintSpring
FEM ConstraintTemperature
FEM ConstraintTie
FEM ConstraintTransform
FEM CreateNodesSet
FEM Element Types
FEM ElementFluid1D
FEM ElementGeometry1D
FEM ElementGeometry2D
FEM ElementRotation1D
FEM EquationDeformation
FEM EquationElasticity
FEM EquationElectricforce
FEM EquationElectrostatic
FEM EquationFlow
FEM EquationFlux
FEM EquationHeat
FEM EquationMagnetodynamic
FEM EquationMagnetodynamic2D
FEM Example Capacitance Two Balls
FEM Examples
FEM FemMesh2Mesh
FEM FrontISTR Workbench
FEM Geometry Preparation and Meshing
FEM Install
FEM MaterialEditor
FEM MaterialFluid
FEM MaterialMechanicalNonlinear
FEM MaterialReinforced
FEM MaterialSolid
FEM Mesh
FEM Mesh CalculiX
FEM MeshBoundaryLayer
FEM MeshClear
FEM MeshDisplayInfo
FEM MeshGmshFromShape
FEM MeshGroup
FEM MeshNetgenFromShape
FEM MeshRegion
FEM PostApplyChanges
FEM PostCreateFunctionBox
FEM PostCreateFunctionCylinder
FEM PostCreateFunctionPlane
FEM PostCreateFunctionSphere
FEM PostFilterClipRegion
FEM PostFilterClipScalar
FEM PostFilterContours
FEM PostFilterCutFunction
FEM PostFilterDataAlongLine
FEM PostFilterDataAtPoint
FEM PostFilterLinearizedStresses
FEM PostFilterWarp
FEM PostPipelineFromResult
FEM Preferences
FEM ResultShow
FEM ResultsPurge
FEM Shear of a Composite Block
FEM Solver
FEM SolverCalculiX
FEM SolverCalculixCxxtools
FEM SolverControl
FEM SolverElmer
FEM SolverElmer SolverSettings
FEM SolverMystran
FEM SolverRun
FEM SolverZ88
FEM tutorial
FEM Tutorial Python
FEM Workbench
FEMbyGEN Workbench
File Format FCStd
Fine-tuning
Flamingo Workbench
Flatpak
FreeCAD and DWG Import
FreeCAD and DXF Import
FreeCAD and Mesh Import
FreeCAD API
FreeCAD Build Tool
FreeCAD Community Portal
FreeCAD Docker CLI mode
FreeCAD Managing Expectations
FreeCAD Scripting Basics
FreeCAD used in production
FreeCAD vector math library
FreeCAD-SH3D
FreeCAD-Ship s60 tutorial
FreeCAD-Ship s60 tutorial (II)
FreeCADGui API
Frequently asked questions
Getting started
Git buildpackage
Glossary
GlTF
Gui Command
GuiCommand model
Headless FreeCAD
Help
Help FreeCAD
History
How to install additional workbenches
How to install macros
IfcOpenShell
IfcPlusPlus
Image CreateImagePlane
Image Open
Image Scaling
Image Workbench
ImageConv
Import Export
Import Export Preferences
Import from STL or OBJ
Import OpenSCAD code
Import text and geometry from Inkscape
Import/Export IFC - compiling IfcOpenShell
Important information
Importing From Sketchup
InputField
Inspection Workbench
Installing additional components
Installing Helpfile
Installing more workbenches
Installing on Linux
Installing on Mac
Installing on Windows
Interface
Interface creation
Interface Customization
Introduction to Python
Key ASCII
KicadStepUp Workbench
Lattice2 AttachablePlacement
Lattice2 Workbench
LGTM
Licence
Line drawing function
LinkSub
LinkSubList
Linux packaging
Localisation
Localisation Sidebar
Localization Older Methods
LuxCoreRender
LuxRender
MacOS packaging
Macro 3D Parametric Curve
Macro 3d Printer Slicer
Macro 3d Printer Slicer Individual Parts
Macro 3D Printer Workflow
Macro 3DXML import
Macro AeroFoil
Macro Airfoil Import & Scale
Macro Alias For Table For Object
Macro Alias Manager
Macro Align Camera to Working Plane
Macro Align Face Object to View
Macro Align Object to View
Macro Align View to Face
Macro Align Working Plane to Camera
Macro Animated Constrain
Macro Animator
Macro Apothem Based Prism GUI
Macro Arch Axis System Repartition
Macro ArrayCopy
Macro Assemblage Imprimante 3D
Macro Assembly
Macro at Startup
Macro Automatic drawing
Macro Bevel
Macro BOLTS
Macro BoundingBox Tracing
Macro BSurf from grid
Macro Build Utility
Macro Cabinets32
Macro CartoucheFC
Macro CartoucheFC 2
Macro CartoucheFC Full
Macro Center Align Objects with Faces or Edges
Macro CenterFace
Macro CenterOfMass
Macro Circle
Macro CirclePlus
Macro clone explicit
Macro CloneConvert
Macro Colorize
Macro Compound Plus
Macro Connect And Sweep
Macro Constraint Draft
Macro ConstraintToAlias
Macro Convert 021
Macro Copy3DViewToClipboard
Macro Corner shapes wizard
Macro Corner shapes wizard/update
Macro crank simul
Macro Creating faces from a DXF file
Macro cross section
Macro Cut Circle
Macro Cut Line
Macro DeepCopy
Macro Delta xyz
Macro documentation
Macro Draft Circle 3 Points
Macro Draft Circle 3 Points 3D
Macro Draft Circle Tangent
Macro Draw 2D Function
Macro Draw Parametric 2D Function
Macro Dump Objects
Macro Duplicate Selection
Macro DXF to Face and Sketch
Macro Easy cutouts for Enclosure Design
Macro EasyAlias
Macro EasyReflector
Macro EdgesToArc
Macro Editor Assistant
Macro Ellipse-Center+2Points
Macro ExpandTreeItem
Macro export transient FEM results
Macro Extract Wires from Mesh
Macro FaceToSketch
Macro FC Convert Lines
Macro FC element selector
Macro FCBmpImport
Macro FCCamera
Macro FCCamGroover
Macro FCCircularText
Macro FCGear
Macro FCHoneycombMaker
Macro FCInfo
Macro FCInfo Alternate Linux
Macro FCInfo ToolBar
Macro FCInfoGlass
Macro FCInfoToMouse
Macro FCSpreadSheet Extract
Macro FCSpring Helix Variable
Macro FCSpring On Surface
Macro FCTreeView
Macro FCWire To Volume
Macro FindAliasReferences
Macro findConfigFiles
Macro FlattenWire
Macro FlattenWire3Points
Macro Fonts Win10 PYMP
Macro ForceRecompute
Macro FreeCAD to Kerkythea
Macro GenerateDrawing
Macro GenerateViews
Macro Geneva Wheel
Macro Geneva Wheel GUI
Macro Geodesic Dome
Macro Global Variable Watcher
Macro GMSH
Macro GuiResetToolbars
Macro Guitar fretboard
Macro Guitar Nut
Macro Half turn stairs
Macro Half-Hull Model
Macro HealArcs
Macro HiddenAlls
Macro HighlightCommon
Macro HighlightDifference
Macro HilbertCurve
Macro hinge
Macro Honeycomb
Macro If Selected Stay If Not Then Delete
Macro Iges PyImporter
Macro Image Scaling
Macro ImperialScales
Macro ImportAirfoil
Macro Intersection
Macro Joint
Macro JointWire
Macro Kerkythea
Macro Line Length
Macro Loft
Macro MacroMenu
Macro MacroToolbarManager
Macro Make Arc 3 Points
Macro Make Circle 3 Points
Macro Make Cube
Macro MatrixTransform
Macro MeasureCircle
Macro Megaminx
Macro merge duplicate materials
Macro MeshToPart
Macro MessageBox
Macro Mouse Cross
Macro Mouse over cb
Macro MoveToOrigin
Macro MultiCopy
Macro MultiCuts
Macro Normal Vector
Macro ObjectInfo
Macro Overlap
Macro Parametric Curve FP
Macro Parametric Defeaturing
Macro PartsLibrary
Macro PartToVRML
Macro PCBWay
Macro PDWrapper
Macro Perpendicular To Wire
Macro Pinger
Macro Place Image
Macro PlacementAbsolufy
Macro Polyhedrons
Macro Print SceneGraph
Macro PropertyMemo
Macro Pyramid
Macro Python Assistant Window
Macro Recompute Profiler
Macro Rectellipse
Macro Remove parametric history
Macro Replace Part in Assembly
Macro Repro Wire
Macro Rotate To Point
Macro Rotate View
Macro Rotate View Free
Macro Rotate ViewAxonometric
Macro Rubik Cube
Macro Screen Wiki
Macro screw maker1 2
Macro Section
Macro Select Hovering
Macro SelectVisible
Macro Shake Sketch
Macro Sheet Metal Unfolder
Macro SimpleProperties
Macro Site From Contours
Macro Sketch Constraint From Spreadsheet
Macro SketchUnmap
Macro Snip
Macro Solid Sweep
Macro SplitPropEditor
Macro Spreadsheet2html
Macro SpreadsheetTools
Macro Spring
Macro Stairs
Macro StraightenObject
Macro SuperWire
Macro TemplateHelper
Macro Texture
Macro Texture Objects
Macro TimingGear
Macro TNP Solution
Macro Toggle Drawstyle
Macro Toggle Drawstyle Optimized
Macro Toggle Panels Visibility
Macro Toggle Visibility
Macro Toggle Visibility2 1-2
Macro Toggle Visibility2 2-2
Macro TreeToAscii
Macro Triangle AH
Macro Unbind Numpad Shortcuts
Macro Unfold Box
Macro Unroll Ruled Surface
Macro View Rotation
Macro Visibility Manager
Macro VisibleAlls
Macro Wiki Object Properties List Generator
Macro Wiki Object Properties List Generator Basic Version
Macro WireFilter
Macro WireXYZ
Macro Wiring And Hoses
Macro WorkFeatures
Macro Z Height Map
Macro Zoom1 1
Macros
Macros recipes
Main Page
Main view area
Manipulator Workbench
Manual:A gentle introduction
Manual:All workbenches at a glance
Manual:BIM modeling
Manual:Creating and manipulating geometry
Manual:Creating FEM analyses
Manual:Creating interface tools
Manual:Creating parametric objects
Manual:Creating renderings
Manual:Generating 2D drawings
Manual:Import and export to other filetypes
Manual:Installing
Manual:Introduction
Manual:Modeling for product design
Manual:Navigating in the 3D view
Manual:Parametric objects
Manual:Preparing models for 3D printing
Manual:Summary
Manual:The Community
Manual:The FreeCAD document
Manual:The FreeCAD Interface
Manual:Traditional 2D drafting
Manual:Traditional modeling, the CSG way
Manual:Using spreadsheets
Manual:What is FreeCAD
Matrix API
Measurement Of Angles On Holes
Mesh
Mesh AddFacet
Mesh API
Mesh BoundingBox
Mesh BuildRegularSolid
Mesh CrossSections
Mesh CurvatureInfo
Mesh Decimating
Mesh Difference
Mesh EvaluateFacet
Mesh EvaluateSolid
Mesh Evaluation
Mesh Export
Mesh Feature
Mesh FillInteractiveHole
Mesh FillupHoles
Mesh FlipNormals
Mesh FromPartShape
Mesh HarmonizeNormals
Mesh Import
Mesh Intersection
Mesh Merge
Mesh MeshObject
Mesh PolyCut
Mesh PolyTrim
Mesh RemeshGmsh
Mesh RemoveCompByHand
Mesh RemoveComponents
Mesh Scale
Mesh Scripting
Mesh SectionByPlane
Mesh Segmentation
Mesh SegmentationBestFit
Mesh Smoothing
Mesh SplitComponents
Mesh to Part
Mesh TrimByPlane
Mesh Union
Mesh VertexCurvature
Mesh Workbench
MeshPart CreateFlatFace
MeshPart CreateFlatMesh
MeshRemodel Workbench
MIBA
Migrating to FreeCAD from Fusion360
Migrating to FreeCAD from OnShape
Migrating to FreeCAD from Revit
Migrating to FreeCAD from SolidWorks
Misc templates
Misc templates Full
Model
ModernUI Workbench
MOOC Workbench
Mouse navigation
Multithreading
Navigation Cube
NumPy
O-X-Y Type Attachment Modes
Object API
Object name
Onboarding FEM Devs
Online Help Startpage
Online Help Toc
OpenCamLib
OpenCASCADE
OpenSCAD AddOpenSCADElement
OpenSCAD ColorCodeShape
OpenSCAD CSG
OpenSCAD Edgestofaces
OpenSCAD ExpandPlacements
OpenSCAD ExplodeGroup
OpenSCAD Hull
OpenSCAD IncreaseToleranceFeature
OpenSCAD MeshBoolean
OpenSCAD Minkowski
OpenSCAD MirrorMeshFeature
OpenSCAD Preferences
OpenSCAD RefineShapeFeature
OpenSCAD RemoveSubtree
OpenSCAD ReplaceObject
OpenSCAD ResizeMeshFeature
OpenSCAD ScaleMeshFeature
OpenSCAD Workbench
Organization chart
OSE 3D Printer Workbench
OSE Piping Workbench
Package Metadata
Packaging
Part
Part and PartDesign
Part API
Part Boolean
Part BooleanFragments
Part Box
Part BoxSelection
Part Builder
Part Chamfer
Part CheckGeometry
Part Circle
Part Common
Part CompCompoundTools
Part CompJoinFeatures
Part CompOffsetTools
Part Compound
Part CompoundFilter
Part CompSplittingTools
Part Cone
Part CrossSections
Part Cut
Part Cylinder
Part Defeaturing
Part EditAttachment
Part ElementCopy
Part Ellipse
Part Ellipsoid
Part ExplodeCompound
Part Export
Part Extrude
Part FaceColors
Part Feature
Part Fillet
Part Fuse
Part Helix
Part Import
Part JoinConnect
Part JoinCutout
Part JoinEmbed
Part Line
Part Loft
Part Loft Technical Details
Part MakeFace
Part MakeSolid
Part Measure Angular
Part Measure Clear All
Part Measure Linear
Part Measure Refresh
Part Measure Toggle 3D
Part Measure Toggle All
Part Measure Toggle Delta
Part Mirror
Part Module
Part Offset
Part Offset2D
Part Part2DObject
Part Plane
Part Point
Part PointsFromMesh
Part Primitives
Part Prism
Part ProjectionOnSurface
Part RefineShape
Part RegularPolygon
Part ReverseShape
Part Revolve
Part RuledSurface
Part Scale
Part scripting
Part Section
Part SectionCut
Part ShapeFromMesh
Part SimpleCopy
Part Slice
Part SliceApart
Part Sphere
Part Spiral
Part Sweep
Part Thickness
Part TopoShape
Part Torus
Part TransformedCopy
Part Tube
Part Wedge
Part XOR
PartDesign AdditiveBox
PartDesign AdditiveCone
PartDesign AdditiveCylinder
PartDesign AdditiveEllipsoid
PartDesign AdditiveHelix
PartDesign AdditiveLoft
PartDesign AdditivePipe
PartDesign AdditivePrism
PartDesign AdditiveSphere
PartDesign AdditiveTorus
PartDesign AdditiveWedge
PartDesign Bearingholder Tutorial I
PartDesign Bearingholder Tutorial II
PartDesign Body
PartDesign Boolean
PartDesign Chamfer
PartDesign Clone
PartDesign CompPrimitiveAdditive
PartDesign CompPrimitiveSubtractive
PartDesign CoordinateSystem
PartDesign Draft
PartDesign Examples
PartDesign Feature
PartDesign Fillet
PartDesign Groove
PartDesign Hole
PartDesign InvoluteGear
PartDesign Line
PartDesign LinearPattern
PartDesign Migrate
PartDesign Mirrored
PartDesign MoveFeature
PartDesign MoveFeatureInTree
PartDesign MoveTip
PartDesign MultiTransform
PartDesign NewSketch
PartDesign Pad
PartDesign Plane
PartDesign Pocket
PartDesign Point
PartDesign PolarPattern
PartDesign Preferences
PartDesign Revolution
PartDesign Scaled
PartDesign ShapeBinder
PartDesign Sprocket
PartDesign SubShapeBinder
PartDesign SubtractiveBox
PartDesign SubtractiveCone
PartDesign SubtractiveCylinder
PartDesign SubtractiveEllipsoid
PartDesign SubtractiveHelix
PartDesign SubtractiveLoft
PartDesign SubtractivePipe
PartDesign SubtractivePrism
PartDesign SubtractiveSphere
PartDesign SubtractiveTorus
PartDesign SubtractiveWedge
PartDesign Thickness
PartDesign tutorial
PartDesign WizardShaft
PartDesign Workbench
Parts Library Workbench
PCB Workbench
PDF
Pivy
Placement
Placement API
Plot Axes
Plot Basic tutorial
Plot Grid
Plot Labels
Plot Legend
Plot MultiAxes tutorial
Plot Positions
Plot Save
Plot Series
Plot Workbench
Points Convert
Points Export
Points Import
Points Merge
Points PolyCut
Points Structure
Points Workbench
Post-Processing of FEM Results with Paraview
POV-Ray
POV-Ray-Rendering Workbench
Power users hub
Preference Packs
Preferences Editor
Private Preference Packs
Profiling
Property
Property editor
PropertyLink: InList and OutList
Pyramids and polyhedrons Workbench
Pyrate Workbench
PySide
PySide Advanced Examples
PySide Beginner Examples
PySide Intermediate Examples
PySide usage snippets
Python
Python console
Python Development Environment
Python scripting tutorial
PythonOCC
Qt Example
Quantity
Raytracing API example
Raytracing ExportProject
Raytracing InsertPart
Raytracing Lux
Raytracing New
Raytracing Preferences
Raytracing Render
Raytracing ResetCamera
Raytracing templates
Raytracing tutorial
Raytracing Workbench
Raytracing WriteCamera
Raytracing WritePart
Raytracing WriteView
Reinforcement API
Reinforcement BarBendingSchedule
Reinforcement BarShapeCutList
Reinforcement BeamRebars
Reinforcement BentShapeRebar
Reinforcement BillOfMaterial
Reinforcement ColumnRebars
Reinforcement ColumnRebars Circular
Reinforcement ColumnRebars TwoTiesSixRebars
Reinforcement Custom Spacing
Reinforcement DrawingDimensioning
Reinforcement FootingRebars
Reinforcement HelicalRebar
Reinforcement LShapeRebar
Reinforcement SlabRebars
Reinforcement StirrupRebar
Reinforcement StraightRebar
Reinforcement UShapeRebar
Reinforcement Workbench
Release notes 0.13
Release notes 0.14
Release notes 0.15
Release notes 0.16
Release notes 0.17
Release notes 0.18
Release notes 0.19
Release notes 0.20
Release notes 0.21
Release notes 0.22
Render Workbench
Report view
Reverse Engineering Workbench
Robot 6-Axis
Robot API example
Robot CreateRobot
Robot CreateTrajectory
Robot Edge2Trac
Robot Export
Robot InsertWaypoint
Robot InsertWaypointPre
Robot RestoreHomePos
Robot SetDefaultOrientation
Robot SetDefaultValues
Robot SetHomePos
Robot Simulate
Robot TrajectoryCompound
Robot TrajectoryDressUp
Robot tutorial
Robot Workbench
Rocket BodyTube
Rocket Bulkhead
Rocket CenteringRing
Rocket CompLaunchGuide
Rocket Ejection Charge Calculator
Rocket Fin
Rocket FinCan
Rocket LaunchLug
Rocket NoseCone
Rocket Parachute Size Calculator
Rocket RailButton
Rocket RailGuide
Rocket Thrust To Weight Calculator
Rocket Transition
Rocket Vent Hole Size Calculator
Rocket Workbench
Scenegraph
Scientific literature
Screenshots
Scripted objects
Scripted objects migration
Scripted objects saving attributes
Scripted objects with attachment
Scripted Parts: Ball Bearing - Part 1
Scripted Parts: Ball Bearing - Part 2
Scripting and macros
Scripts
SearchBar Mod
Selection API
Selection methods
Selection view
Shape
SheetMetal AddBase
SheetMetal AddBend
SheetMetal AddCornerRelief
SheetMetal AddFoldWall
SheetMetal AddJunction
SheetMetal AddRelief
SheetMetal AddWall
SheetMetal BaseShape
SheetMetal Examples
SheetMetal Extrude
SheetMetal Forming
SheetMetal SketchOnSheet
SheetMetal UnattendedUnfold
SheetMetal Unfold
SheetMetal Workbench
Ship AreasCurve
Ship Capacity
Ship CreateShip
Ship GZ
Ship Hydrostatics
Ship LoadCondition
Ship LoadExample
Ship Tank
Ship Weight
Ship Workbench
Silk Workbench
Sketch
Sketcher ArcOverlay
Sketcher BSplineApproximate
Sketcher BSplineComb
Sketcher BSplineDecreaseDegree
Sketcher BSplineDecreaseKnotMultiplicity
Sketcher BSplineDegree
Sketcher BSplineIncreaseDegree
Sketcher BSplineIncreaseKnotMultiplicity
Sketcher BSplineInsertKnot
Sketcher BSplineKnotMultiplicity
Sketcher BSplinePoleWeight
Sketcher BSplinePolygon
Sketcher CarbonCopy
Sketcher Clone
Sketcher CloseShape
Sketcher ConnectLines
Sketcher ConstrainAngle
Sketcher ConstrainBlock
Sketcher ConstrainCoincident
Sketcher ConstrainCoincidentUnified
Sketcher ConstrainDiameter
Sketcher ConstrainDistance
Sketcher ConstrainDistanceX
Sketcher ConstrainDistanceY
Sketcher ConstrainEqual
Sketcher ConstrainHorizontal
Sketcher ConstrainHorVer
Sketcher ConstrainLock
Sketcher ConstrainParallel
Sketcher ConstrainPerpendicular
Sketcher ConstrainPointOnObject
Sketcher ConstrainRadiam
Sketcher ConstrainRadius
Sketcher ConstrainSnellsLaw
Sketcher ConstrainSymmetric
Sketcher ConstrainTangent
Sketcher ConstrainVertical
Sketcher Copy
Sketcher Create3PointArc
Sketcher Create3PointCircle
Sketcher CreateArc
Sketcher CreateArcOfEllipse
Sketcher CreateArcOfHyperbola
Sketcher CreateArcOfParabola
Sketcher CreateArcSlot
Sketcher CreateBSpline
Sketcher CreateBSplineByInterpolation
Sketcher CreateCircle
Sketcher CreateEllipseBy3Points
Sketcher CreateEllipseByCenter
Sketcher CreateFillet
Sketcher CreateHeptagon
Sketcher CreateHexagon
Sketcher CreateLine
Sketcher CreateOblong
Sketcher CreateOctagon
Sketcher CreatePentagon
Sketcher CreatePeriodicBSpline
Sketcher CreatePeriodicBSplineByInterpolation
Sketcher CreatePoint
Sketcher CreatePointFillet
Sketcher CreatePolyline
Sketcher CreateRectangle
Sketcher CreateRectangle Center
Sketcher CreateRegularPolygon
Sketcher CreateSlot
Sketcher CreateSquare
Sketcher CreateTriangle
Sketcher DeleteAllConstraints
Sketcher DeleteAllGeometry
Sketcher Dialog
Sketcher Dimension
Sketcher EditSketch
Sketcher Examples
Sketcher Extend
Sketcher External
Sketcher Grid
Sketcher helper constraint
Sketcher JoinCurves
Sketcher LeaveSketch
Sketcher MapSketch
Sketcher MergeSketches
Sketcher Micro Tutorial - Constraint Practices
Sketcher MirrorSketch
Sketcher Move
Sketcher NewSketch
Sketcher Offset
Sketcher Preferences
Sketcher RectangularArray
Sketcher reference
Sketcher RemoveAxesAlignment
Sketcher RenderingOrder
Sketcher ReorientSketch
Sketcher requirement for a sketch
Sketcher RestoreInternalAlignmentGeometry
Sketcher Rotate
Sketcher scripting
Sketcher SelectConflictingConstraints
Sketcher SelectConstraints
Sketcher SelectElementsAssociatedWithConstraints
Sketcher SelectElementsWithDoFs
Sketcher SelectHorizontalAxis
Sketcher SelectOrigin
Sketcher SelectRedundantConstraints
Sketcher SelectVerticalAxis
Sketcher SketchObject
Sketcher Snap
Sketcher Split
Sketcher StopOperation
Sketcher SwitchVirtualSpace
Sketcher Symmetry
Sketcher ToggleActiveConstraint
Sketcher ToggleConstruction
Sketcher ToggleDrivingConstraint
Sketcher Trimming
Sketcher Tutorial
Sketcher ValidateSketch
Sketcher ViewSection
Sketcher ViewSketch
Sketcher Workbench
Source code management
Source documentation
Sphinx
Splash screen
Spreadsheet
Spreadsheet AlignBottom
Spreadsheet AlignCenter
Spreadsheet AlignLeft
Spreadsheet AlignRight
Spreadsheet AlignTop
Spreadsheet AlignVCenter
Spreadsheet CreateSheet
Spreadsheet CSV
Spreadsheet Export
Spreadsheet Import
Spreadsheet MergeCells
Spreadsheet Preferences
Spreadsheet SetAlias
Spreadsheet SplitCell
Spreadsheet StyleBold
Spreadsheet StyleItalic
Spreadsheet StyleUnderline
Spreadsheet Workbench
Standard Menu
Start Preferences
Start up and Configuration
Start Workbench
Status bar
Std About
Std ActivateNextWindow
Std ActivatePrevWindow
Std AddonMgr
Std Alignment
Std AxisCross
Std Base
Std BoxElementSelection
Std BoxSelection
Std CascadeWindows
Std CloseActiveWindow
Std CloseAllWindows
Std Copy
Std Cut
Std Delete
Std DemoMode
Std DependencyGraph
Std DlgCustomize
Std DlgMacroExecute
Std DlgMacroExecuteDirect
Std DlgMacroRecord
Std DlgParameter
Std DlgPreferences
Std DrawStyle
Std DuplicateSelection
Std Edit
Std Edit Menu
Std Export
Std File Menu
Std FreeCADDonation
Std FreeCADFAQ
Std FreeCADForum
Std FreeCADPowerUserHub
Std FreeCADUserHub
Std FreeCADWebsite
Std FreezeViews
Std Group
Std Help Menu
Std HideObjects
Std HideSelection
Std Import
Std LinkImport
Std LinkImportAll
Std LinkMake
Std LinkMakeRelative
Std LinkReplace
Std LinkSelectAllLinks
Std LinkSelectLinked
Std LinkSelectLinkedFinal
Std LinkUnlink
Std Macro Menu
Std MacroAttachDebugger
Std MacroStartDebug
Std MacroStepInto
Std MacroStepOver
Std MacroStopDebug
Std MacroStopRecord
Std MainFullscreen
Std MeasureDistance
Std MergeProjects
Std New
Std OnlineHelp
Std Open
Std OrthographicCamera
Std Part
Std Paste
Std PerspectiveCamera
Std Placement
Std Print
Std PrintPdf
Std PrintPreview
Std ProjectInfo
Std ProjectUtil
Std PythonHelp
Std Quit
Std RandomColor
Std RecallWorkingView
Std RecentFiles
Std Redo
Std Refresh
Std ReportBug
Std Revert
Std Save
Std SaveAll
Std SaveAs
Std SaveCopy
Std SceneInspector
Std SelBack
Std SelBoundingBox
Std SelectAll
Std SelectVisibleObjects
Std SelForward
Std SendToPythonConsole
Std SetAppearance
Std ShowObjects
Std ShowSelection
Std StoreWorkingView
Std TextDocument
Std TextureMapping
Std TileWindows
Std ToggleBreakpoint
Std ToggleClipPlane
Std ToggleNavigation
Std ToggleObjects
Std ToggleSelectability
Std ToggleVisibility
Std Tools Menu
Std TransformManip
Std TreeCollapseDocument
Std TreeDrag
Std TreeMultiDocument
Std TreePreSelection
Std TreeRecordSelection
Std TreeSelection
Std TreeSingleDocument
Std TreeSyncPlacement
Std TreeSyncSelection
Std TreeSyncView
Std Undo
Std UnitsCalculator
Std UserEditMode
Std View Menu
Std ViewBottom
Std ViewBoxZoom
Std ViewCreate
Std ViewDimetric
Std ViewDockUndockFullscreen
Std ViewFitAll
Std ViewFitSelection
Std ViewFront
Std ViewFullscreen
Std ViewHome
Std ViewIsometric
Std ViewIvIssueCamPos
Std ViewIvStereoInterleavedColumns
Std ViewIvStereoInterleavedRows
Std ViewIvStereoOff
Std ViewIvStereoQuadBuff
Std ViewIvStereoRedGreen
Std ViewLeft
Std ViewLoadImage
Std ViewRear
Std ViewRight
Std ViewRotateLeft
Std ViewRotateRight
Std ViewScreenShot
Std ViewStatusBar
Std ViewTop
Std ViewTrimetric
Std ViewZoomIn
Std ViewZoomOut
Std WhatsThis
Std Windows
Std Windows Menu
Std Workbench
Stemfie Workbench
Surface BlendCurve
Surface CurveOnMesh
Surface ExtendFace
Surface Filling
Surface GeomFillSurface
Surface Sections
Surface Workbench
SVG
Svg Namespace
Swag
SweetHome3D
Symbols Library Workbench
Task panel
Tasks Placement
TechDraw 2LineCenterLine
TechDraw 2PointCenterLine
TechDraw 2PointCosmeticLine
TechDraw 3PtAngleDimension
TechDraw ActiveView
TechDraw AngleDimension
TechDraw Annotation
TechDraw API
TechDraw ArchView
TechDraw AxoLengthDimension
TechDraw Balloon
TechDraw ClipGroup
TechDraw ClipGroupAdd
TechDraw ClipGroupRemove
TechDraw CommandAddOffsetVertex
TechDraw ComplexSection
TechDraw CosmeticCircle
TechDraw CosmeticEraser
TechDraw CosmeticVertex
TechDraw DecorateLine
TechDraw DetailView
TechDraw DiameterDimension
TechDraw DimensionRepair
TechDraw DraftView
TechDraw ExportPageDXF
TechDraw ExportPageSVG
TechDraw ExtensionArcLengthAnnotation
TechDraw ExtensionAreaAnnotation
TechDraw ExtensionCascadeHorizDimension
TechDraw ExtensionCascadeObliqueDimension
TechDraw ExtensionCascadeVertDimension
TechDraw ExtensionChangeLineAttributes
TechDraw ExtensionCircleCenterLines
TechDraw ExtensionCreateHorizChainDimension
TechDraw ExtensionCreateHorizChamferDimension
TechDraw ExtensionCreateHorizCoordDimension
TechDraw ExtensionCreateLengthArc
TechDraw ExtensionCreateObliqueChainDimension
TechDraw ExtensionCreateObliqueCoordDimension
TechDraw ExtensionCreateVertChainDimension
TechDraw ExtensionCreateVertChamferDimension
TechDraw ExtensionCreateVertCoordDimension
TechDraw ExtensionCustomizeFormat
TechDraw ExtensionDecreaseDecimal
TechDraw ExtensionDrawCosmArc
TechDraw ExtensionDrawCosmCircle
TechDraw ExtensionDrawCosmCircle3Points
TechDraw ExtensionExtendLine
TechDraw ExtensionHoleCircle
TechDraw ExtensionIncreaseDecimal
TechDraw ExtensionInsertDiameter
TechDraw ExtensionInsertSquare
TechDraw ExtensionLineParallel
TechDraw ExtensionLinePerpendicular
TechDraw ExtensionLockUnlockView
TechDraw ExtensionPosHorizChainDimension
TechDraw ExtensionPositionSectionView
TechDraw ExtensionPosObliqueChainDimension
TechDraw ExtensionPosVertChainDimension
TechDraw ExtensionRemovePrefixChar
TechDraw ExtensionSelectLineAttributes
TechDraw ExtensionShortenLine
TechDraw ExtensionThreadBoltBottom
TechDraw ExtensionThreadBoltSide
TechDraw ExtensionThreadHoleBottom
TechDraw ExtensionThreadHoleSide
TechDraw ExtensionVertexAtIntersection
TechDraw FaceCenterLine
TechDraw General Examples
TechDraw Geometric dimensioning and tolerancing
TechDraw GeometricHatch
TechDraw Hatch
TechDraw Hatching
TechDraw HoleShaftFit
TechDraw HorizontalDimension
TechDraw HorizontalExtentDimension
TechDraw HowTo Page
TechDraw Image
TechDraw LandmarkDimension
TechDraw LeaderLine
TechDraw LengthDimension
TechDraw LineGroup
TechDraw LinkDimension
TechDraw Midpoints
TechDraw MoveView
TechDraw PageDefault
TechDraw PageTemplate
TechDraw Pitch Circle Tutorial
TechDraw Preferences
TechDraw PrintAll
TechDraw ProjectionGroup
TechDraw ProjectShape
TechDraw Quadrants
TechDraw RadiusDimension
TechDraw RedrawPage
TechDraw RichTextAnnotation
TechDraw Section Examples
TechDraw SectionView
TechDraw ShareView
TechDraw ShowAll
TechDraw SpreadsheetView
TechDraw StackBottom
TechDraw StackDown
TechDraw StackTop
TechDraw StackUp
TechDraw SurfaceFinishSymbol
TechDraw Symbol
TechDraw TemplateGenerator
TechDraw TemplateHowTo
TechDraw Templates
TechDraw ToggleFrame
TechDraw VerticalDimension
TechDraw VerticalExtentDimension
TechDraw View
TechDraw WeldSymbol
TechDraw Workbench
TechDrawGui API
Testing
The FreeCAD source code
Third Party Libraries
Third Party Tools
Thread for Screw Tutorial
ThreadProfile Workbench
Timber Workbench
Toothbrush Head Stand
Topological data scripting
Topological naming problem
TopoShape API
Tracker
Transient FEM analysis
Translating an external workbench
Transportation Workbench
Tree view
Tutorial custom placing of windows and doors
Tutorial for open windows
Tutorial FreeCAD POV ray
Tutorial KinematicAssembly
Tutorial KinematicController
Tutorial KinematicSkeleton
Tutorial Render with Blender
Tutorials
Ubuntu Snap
Units
User hub
Vector API
Video tutorials
Video tutorials for architectural design
Video tutorials for product design
View Measure Clear All
View Measure Toggle All
ViewObject API
Viewprovider
VRML Preparation for Robot Simulation
Web BrowserBack
Web BrowserNext
Web BrowserRefresh
Web BrowserSetURL
Web BrowserStop
Web BrowserZoomIn
Web BrowserZoomOut
Web OpenWebsite
Web Workbench
WebTools BimServer
WebTools Git
WebTools Sketchfab
WebTools Workbench
Which workbench should I choose
Whiffle Ball tutorial
Wikihouse porting tutorial
WikiPages
WikiRobots
Windows packaging
Wood Frame Workbench
Workarounds
Workbench creation
Workbenches
Workfeature Workbench
Wrapping a Cplusplus class in Python
Language
aa - Qafár af
ab - аԥсшәа
abs - bahasa ambon
ace - Acèh
ady - адыгабзэ
ady-cyrl - адыгабзэ
aeb - تونسي / Tûnsî
aeb-arab - تونسي
aeb-latn - Tûnsî
af - Afrikaans
ak - Akan
aln - Gegë
alt - алтай тил
am - አማርኛ
ami - Pangcah
an - aragonés
ang - Ænglisc
ann - Obolo
anp - अंगिका
ar - العربية
arc - ܐܪܡܝܐ
arn - mapudungun
arq - جازايرية
ary - الدارجة
arz - مصرى
as - অসমীয়া
ase - American sign language
ast - asturianu
atj - Atikamekw
av - авар
avk - Kotava
awa - अवधी
ay - Aymar aru
az - azərbaycanca
azb - تۆرکجه
ba - башҡортса
ban - Basa Bali
ban-bali - ᬩᬲᬩᬮᬶ
bar - Boarisch
bbc - Batak Toba
bbc-latn - Batak Toba
bcc - جهلسری بلوچی
bci - wawle
bcl - Bikol Central
be - беларуская
be-tarask - беларуская (тарашкевіца)
bg - български
bgn - روچ کپتین بلوچی
bh - भोजपुरी
bho - भोजपुरी
bi - Bislama
bjn - Banjar
blk - ပအိုဝ်ႏဘာႏသာႏ
bm - bamanankan
bn - বাংলা
bo - བོད་ཡིག
bpy - বিষ্ণুপ্রিয়া মণিপুরী
bqi - بختیاری
br - brezhoneg
brh - Bráhuí
bs - bosanski
btm - Batak Mandailing
bto - Iriga Bicolano
bug - ᨅᨔ ᨕᨘᨁᨗ
bxr - буряад
ca - català
cbk-zam - Chavacano de Zamboanga
cdo - 閩東語 / Mìng-dĕ̤ng-ngṳ̄
ce - нохчийн
ceb - Cebuano
ch - Chamoru
cho - Chahta Anumpa
chr - ᏣᎳᎩ
chy - Tsetsêhestâhese
ckb - کوردی
co - corsu
cps - Capiceño
cr - Nēhiyawēwin / ᓀᐦᐃᔭᐍᐏᐣ
crh - qırımtatarca
crh-cyrl - къырымтатарджа (Кирилл)
crh-latn - qırımtatarca (Latin)
cs - čeština
csb - kaszëbsczi
cu - словѣньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ
cv - чӑвашла
cy - Cymraeg
da - dansk
dag - dagbanli
de - Deutsch
de-at - Österreichisches Deutsch
de-ch - Schweizer Hochdeutsch
de-formal - Deutsch (Sie-Form)
dga - Dagaare
din - Thuɔŋjäŋ
diq - Zazaki
dsb - dolnoserbski
dtp - Dusun Bundu-liwan
dty - डोटेली
dv - ދިވެހިބަސް
dz - ཇོང་ཁ
ee - eʋegbe
egl - Emiliàn
el - Ελληνικά
eml - emiliàn e rumagnòl
en - English
en-ca - Canadian English
en-gb - British English
eo - Esperanto
es - español
es-419 - español de América Latina
es-formal - español (formal)
et - eesti
eu - euskara
ext - estremeñu
fa - فارسی
fat - mfantse
ff - Fulfulde
fi - suomi
fit - meänkieli
fj - Na Vosa Vakaviti
fo - føroyskt
fon - fɔ̀ngbè
fr - français
frc - français cadien
frp - arpetan
frr - Nordfriisk
fur - furlan
fy - Frysk
ga - Gaeilge
gaa - Ga
gag - Gagauz
gan - 贛語
gan-hans - 赣语(简体)
gan-hant - 贛語(繁體)
gcr - kriyòl gwiyannen
gd - Gàidhlig
gl - galego
gld - на̄ни
glk - گیلکی
gn - Avañe'ẽ
gom - गोंयची कोंकणी / Gõychi Konknni
gom-deva - गोंयची कोंकणी
gom-latn - Gõychi Konknni
gor - Bahasa Hulontalo
got - 𐌲𐌿𐍄𐌹𐍃𐌺
gpe - Ghanaian Pidgin
grc - Ἀρχαία ἑλληνικὴ
gsw - Alemannisch
gu - ગુજરાતી
guc - wayuunaiki
gur - farefare
guw - gungbe
gv - Gaelg
ha - Hausa
hak - 客家語/Hak-kâ-ngî
haw - Hawaiʻi
he - עברית
hi - हिन्दी
hif - Fiji Hindi
hif-latn - Fiji Hindi
hil - Ilonggo
ho - Hiri Motu
hr - hrvatski
hrx - Hunsrik
hsb - hornjoserbsce
hsn - 湘语
ht - Kreyòl ayisyen
hu - magyar
hu-formal - magyar (formal)
hy - հայերեն
hyw - Արեւմտահայերէն
hz - Otsiherero
ia - interlingua
id - Bahasa Indonesia
ie - Interlingue
ig - Igbo
igl - Igala
ii - ꆇꉙ
ik - Iñupiatun
ike-cans - ᐃᓄᒃᑎᑐᑦ
ike-latn - inuktitut
ilo - Ilokano
inh - гӀалгӀай
io - Ido
is - íslenska
it - italiano
iu - ᐃᓄᒃᑎᑐᑦ / inuktitut
ja - 日本語
jam - Patois
jbo - la .lojban.
jut - jysk
jv - Jawa
ka - ქართული
kaa - Qaraqalpaqsha
kab - Taqbaylit
kbd - адыгэбзэ
kbd-cyrl - адыгэбзэ
kbp - Kabɩyɛ
kcg - Tyap
kea - kabuverdianu
kg - Kongo
khw - کھوار
ki - Gĩkũyũ
kiu - Kırmancki
kj - Kwanyama
kjh - хакас
kjp - ဖၠုံလိက်
kk - қазақша
kk-arab - قازاقشا (تٴوتە)
kk-cn - قازاقشا (جۇنگو)
kk-cyrl - қазақша (кирил)
kk-kz - қазақша (Қазақстан)
kk-latn - qazaqşa (latın)
kk-tr - qazaqşa (Türkïya)
kl - kalaallisut
km - ភាសាខ្មែរ
kn - ಕನ್ನಡ
ko - 한국어
ko-kp - 조선말
koi - перем коми
kr - kanuri
krc - къарачай-малкъар
kri - Krio
krj - Kinaray-a
krl - karjal
ks - कॉशुर / کٲشُر
ks-arab - کٲشُر
ks-deva - कॉशुर
ksh - Ripoarisch
ksw - စှီၤ
ku - kurdî
ku-arab - كوردي (عەرەبی)
ku-latn - kurdî (latînî)
kum - къумукъ
kus - Kʋsaal
kv - коми
kw - kernowek
ky - кыргызча
la - Latina
lad - Ladino
lb - Lëtzebuergesch
lbe - лакку
lez - лезги
lfn - Lingua Franca Nova
lg - Luganda
li - Limburgs
lij - Ligure
liv - Līvõ kēļ
lki - لەکی
lld - Ladin
lmo - lombard
ln - lingála
lo - ລາວ
loz - Silozi
lrc - لۊری شومالی
lt - lietuvių
ltg - latgaļu
lus - Mizo ţawng
luz - لئری دوٙمینی
lv - latviešu
lzh - 文言
lzz - Lazuri
mad - Madhurâ
mag - मगही
mai - मैथिली
map-bms - Basa Banyumasan
mdf - мокшень
mg - Malagasy
mh - Ebon
mhr - олык марий
mi - Māori
min - Minangkabau
mk - македонски
ml - മലയാളം
mn - монгол
mni - ꯃꯤꯇꯩ ꯂꯣꯟ
mnw - ဘာသာ မန်
mo - молдовеняскэ
mos - moore
mr - मराठी
mrh - Mara
mrj - кырык мары
ms - Bahasa Melayu
ms-arab - بهاس ملايو
mt - Malti
mus - Mvskoke
mwl - Mirandés
my - မြန်မာဘာသာ
myv - эрзянь
mzn - مازِرونی
na - Dorerin Naoero
nah - Nāhuatl
nan - Bân-lâm-gú
nap - Napulitano
nb - norsk bokmål
nds - Plattdüütsch
nds-nl - Nedersaksies
ne - नेपाली
new - नेपाल भाषा
ng - Oshiwambo
nia - Li Niha
niu - Niuē
nl - Nederlands
nl-informal - Nederlands (informeel)
nmz - nawdm
nn - norsk nynorsk
no - norsk
nod - ᨣᩤᩴᨾᩮᩬᩥᨦ
nog - ногайша
nov - Novial
nqo - ߒߞߏ
nrm - Nouormand
nso - Sesotho sa Leboa
nv - Diné bizaad
ny - Chi-Chewa
nyn - runyankore
nys - Nyunga
oc - occitan
ojb - Ojibwemowin
olo - livvinkarjala
om - Oromoo
or - ଓଡ଼ିଆ
os - ирон
pa - ਪੰਜਾਬੀ
pag - Pangasinan
pam - Kapampangan
pap - Papiamentu
pcd - Picard
pcm - Naijá
pdc - Deitsch
pdt - Plautdietsch
pfl - Pälzisch
pi - पालि
pih - Norfuk / Pitkern
pl - polski
pms - Piemontèis
pnb - پنجابی
pnt - Ποντιακά
prg - prūsiskan
ps - پښتو
pt - português
pt-br - português do Brasil
pwn - pinayuanan
qqq - Message documentation
qu - Runa Simi
qug - Runa shimi
rgn - Rumagnôl
rif - Tarifit
rki - ရခိုင်
rm - rumantsch
rmc - romaňi čhib
rmy - romani čhib
rn - ikirundi
ro - română
roa-tara - tarandíne
rsk - руски
ru - русский
rue - русиньскый
rup - armãneashti
ruq - Vlăheşte
ruq-cyrl - Влахесте
ruq-latn - Vlăheşte
rw - Ikinyarwanda
ryu - うちなーぐち
sa - संस्कृतम्
sah - саха тыла
sat - ᱥᱟᱱᱛᱟᱲᱤ
sc - sardu
scn - sicilianu
sco - Scots
sd - سنڌي
sdc - Sassaresu
sdh - کوردی خوارگ
se - davvisámegiella
se-fi - davvisámegiella (Suoma bealde)
se-no - davvisámegiella (Norgga bealde)
se-se - davvisámegiella (Ruoŧa bealde)
sei - Cmique Itom
ses - Koyraboro Senni
sg - Sängö
sgs - žemaitėška
sh - srpskohrvatski / српскохрватски
sh-cyrl - српскохрватски (ћирилица)
sh-latn - srpskohrvatski (latinica)
shi - Taclḥit
shi-latn - Taclḥit
shi-tfng - ⵜⴰⵛⵍⵃⵉⵜ
shn - ၽႃႇသႃႇတႆး
shy - tacawit
shy-latn - tacawit
si - සිංහල
simple - Simple English
sjd - кӣллт са̄мь кӣлл
sje - bidumsámegiella
sk - slovenčina
skr - سرائیکی
skr-arab - سرائیکی
sl - slovenščina
sli - Schläsch
sm - Gagana Samoa
sma - åarjelsaemien
smn - anarâškielâ
sms - nuõrttsääʹmǩiõll
sn - chiShona
so - Soomaaliga
sq - shqip
sr - српски / srpski
sr-ec - српски (ћирилица)
sr-el - srpski (latinica)
srn - Sranantongo
sro - sardu campidanesu
ss - SiSwati
st - Sesotho
stq - Seeltersk
sty - себертатар
su - Sunda
sv - svenska
sw - Kiswahili
syl - ꠍꠤꠟꠐꠤ
szl - ślůnski
szy - Sakizaya
ta - தமிழ்
tay - Tayal
tcy - ತುಳು
tdd - ᥖᥭᥰᥖᥬᥳᥑᥨᥒᥰ
te - తెలుగు
tet - tetun
tg - тоҷикӣ
tg-cyrl - тоҷикӣ
tg-latn - tojikī
th - ไทย
ti - ትግርኛ
tk - Türkmençe
tl - Tagalog
tly - tolışi
tly-cyrl - толыши
tn - Setswana
to - lea faka-Tonga
tok - toki pona
tpi - Tok Pisin
tr - Türkçe
tru - Ṫuroyo
trv - Seediq
ts - Xitsonga
tt - татарча / tatarça
tt-cyrl - татарча
tt-latn - tatarça
tum - chiTumbuka
tw - Twi
ty - reo tahiti
tyv - тыва дыл
tzm - ⵜⴰⵎⴰⵣⵉⵖⵜ
udm - удмурт
ug - ئۇيغۇرچە / Uyghurche
ug-arab - ئۇيغۇرچە
ug-latn - Uyghurche
uk - українська
ur - اردو
uz - oʻzbekcha / ўзбекча
uz-cyrl - ўзбекча
uz-latn - oʻzbekcha
ve - Tshivenda
vec - vèneto
vep - vepsän kel’
vi - Tiếng Việt
vls - West-Vlams
vmf - Mainfränkisch
vmw - emakhuwa
vo - Volapük
vot - Vaďďa
vro - võro
wa - walon
wal - wolaytta
war - Winaray
wls - Fakaʻuvea
wo - Wolof
wuu - 吴语
xal - хальмг
xh - isiXhosa
xmf - მარგალური
xsy - saisiyat
yi - ייִדיש
yo - Yorùbá
yrl - Nhẽẽgatú
yue - 粵語
za - Vahcuengh
zea - Zeêuws
zgh - ⵜⴰⵎⴰⵣⵉⵖⵜ ⵜⴰⵏⴰⵡⴰⵢⵜ
zh - 中文
zh-cn - 中文(中国大陆)
zh-hans - 中文(简体)
zh-hant - 中文(繁體)
zh-hk - 中文(香港)
zh-mo - 中文(澳門)
zh-my - 中文(马来西亚)
zh-sg - 中文(新加坡)
zh-tw - 中文(臺灣)
zu - isiZulu
Format
Export for off-line translation
Export in native format
Export in CSV format
Fetch
{{DISPLAYTITLE:Quellcodeverwaltung}}<languages/> {{TOCright}} <span id="Introduction"></span> == Einführung == Das Hauptwerkzeug zur Quellcodeverwaltung für das FreeCAD-Projekt ist [http://en.wikipedia.org/wiki/Git_%28software%29 Git], das in den meisten Betriebssystemen einfach über einen Paketmanager oder direkt von der Website von [https://git-scm.com/ Git] installiert werden kann. Es wird empfohlen, sich mit Git vertraut zu machen, bevor man direkt mit dem FreeCAD-Quellcode arbeitet. Auf der Seite [https://git-scm.com/doc Git Dokumentation] findet man das Referenzhandbuch sowie das [https://git-scm.com/book/en/v2 Pro Git Book] (beide engl.), um zu lernen, wie das System im Allgemeinen genutzt wird. Das vorliegende Dokument konzentriert sich auf die Verwendung von Git für die FreeCAD-Entwicklung. Die Zusammenstellung von FreeCAD ist unter [[Compiling/de|Kompilieren]] beschrieben. Während Git in erster Linie eine Terminalanwendung ist, gibt es viele grafische Anwendungen, die die Arbeit mit Zweigen, das Anwenden von Patches und das Senden von Pull-Anfragen an einen Master-Zweig erleichtern. Beispiele sind [https://git-scm.com/docs/gitk gitk] (die erste entwickelte grafische Benutzeroberfläche),[https://wiki.gnome.org/Apps/Gitg/ gitg] (Gnome),[https://github.com/tibirna/qgit qgit] (Qt), [https://jonas.github.io/tig/ tig] (Ncurses), [http://github.com/git-cola/git-cola git-cola] und [https://www.gitkraken.com/ GitKraken] (proprietär). Eine kurze Einführung in dieses Werkzeug findet man unter [[Developing FreeCAD with GitKraken/de|Entwicklung von FreeCAD mit GitKraken]]. Hinweis: Wenn dir davon schwindelig wird, gibt es eine sehr gute nicht-technische Serie über die Verwendung von Git und Github mit dem Titel '[https://youtu.be/BCQHnlnPusY Git und Github für Dichter]'. <span id="Source_code_access"></span> == Quellcodezugang== Jeder kann auf den FreeCAD-Quellcode zugreifen und eine Kopie davon bekommen, aber nur die FreeCAD-Projektmanager haben Schreibzugriff darauf. Du kannst eine Kopie des Codes erhalten, ihn studieren und nach Belieben ändern, aber wenn du möchtest, dass deine Änderungen in den offiziellen Quellcode aufgenommen werden, musst du eine "Pull-Anfrage" gegen das Haupt-Repositorium durchführen, damit deine Änderungen von den Verwaltern überprüft werden können. Diese Art der Entwicklung ist bekannt als der [https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows Dictator and Lieutenants Workflow], da die Kern-Entwickler (Diktatoren) und betrauten Entwickler (Leutnante) den Code filtern, der von unabhängigen Entwicklern und Benutzern eingereicht wird. Wenn deine Quellcode-Änderungen signifikant sind, empfehlen wir dir, sie im Pull-Request Abschnitt des [http://forum.freecadweb.org/viewforum.php?f=17 FreeCAD-Forum] zu erklären. [[File:FreeCAD_git_workflow.svg|600px]] {{Caption|Typischer Arbeitsablauf zur Entwicklung von Code für FreeCAD; jeder kann den Code aus dem Haupt-Repositorium beziehen, aber die Hauptentwickler haben das exklusive Recht, Eingaben anderer Entwickler zu überprüfen und zusammenzuführen.}} <span id="Official_GitHub_repository"></span> ===Offizieller GitHub-Ablageordner (Repository)=== Der FreeCAD-Quellcode wird in Github bereitgestellt, {{URL|https://github.com/FreeCAD/FreeCAD}} Um Code beitragen zu können, wird ein [https://github.com/join GitHub-Konto] benötigt. In der Vergangenheit wurde der Quellcode in einem SVN-Repositorium bereitgestellt, {{URL|https://free-cad.svn.sourceforge.net/svnroot/free-cad}}. Dieser wurde am 10. Oktober 2011 mit [https://github.com/FreeCAD/FreeCAD/commit/120ca87015 commit 120ca87015] nach GitHub verschoben. :Daher gibt es viele Änderungen, die vor dieser Zeit vorgenommen wurden, die nicht in der modernen Git-Commit-Geschichte aufgezeichnet sind. Lies mehr dazu auf der Seite [[History/de|Geschichte]]. === Setzen des Git-Benutzernamens === Entwickler sollten Code in ihr persönliches Projektarchiv mit ihrem GitHub-Benutzernamen eintragen. Wenn dieser nicht bereits global gesetzt ist, kann er lokal für das aktuelle Git-Projektarchiv wie folgt gesetzt werden: {{Code|lang=text|code= git config user.name "YOUR_NAME" git config user.email GITHUB_USERNAME@users.noreply.github.com }} Wobei {{incode|"YOUR_NAME"}} deinen vollständigen Namen oder Spitznamen darstellt, der zur Identifizierung des Autors eines bestimmten Beitrags verwendet wird, und {{incode|GITHUB_USERNAME}} den Namen deines Accounts auf GitHub angibt. <span id="Remote_repositories"></span> ===Ferne Projektarchive (Remote repositories)=== Bitte lies [https://stackoverflow.com/questions/9257533/what-is-the-difference-between-origin-and-upstream-on-github#9257901 Was ist der Unterschied zwischen Ursprung und Upstream auf GitHub?] (Stackoverflow) um den Unterschied zwischen {{incode|origin}} und {{incode|upstream}} im Kontext von Git zu verstehen. Dieser Abschnitt erklärt, wie man die richtigen Ablageorte/Projektarchive für die Entwicklung festlegt. Im Wesentlichen: * {{incode|origin}} ist deine persönliche Abzweigung des offiziellen FreeCAD-Projektarchivs, also {{URL|https://github.com/GITHUB_USERNAME/FreeCAD}} * {{incode|upstream}} ist der offizielle FreeCAD-Ablageort, d.h. {{URL|https://github.com/FreeCAD/FreeCAD}} Diese Unterscheidung ist wichtig, da du zuerst Code in deine eigene Kopie des Projektarchivs schreiben solltest, bevor du diese Änderungen in das offizielle Projektarchiv schreibst. Basierend auf dem oben genannten, gibt es zwei Möglichkeiten, deine Git-Entwicklungsumgebung einzurichten: * 1. Methode: Auf GitHub verzweigen und den eigenen Zweig lokal klonen. * 2. Methode: FreeCAD direkt auf den eigenen lokalen Rechner klonen und die fernen Server anpassen. Wir empfehlen die 1. Methode, weil sie einen Schritt schneller ist. <div class="mw-collapsible mw-collapsed toccolours"> <span id="1st_Method:_Fork_on_GitHub_and_clone_your_fork_locally"></span> ====1. Methode: Auf GitHub verzweigen und den eigenen Zweig lokal klonen==== <div class="mw-collapsible-content"> Zuerst teile das FreeCAD Repositorium in GitHub ab, dann klone diese persönliche Abspaltung auf deinen Computer, und schließlich lege das {{incode|upstream}} Repositorium fest. * [https://github.com/join Anmelden] auf dein GitHub Konto. * Gehe zum offiziellen FreeCAD Repositorium: {{URL|https://github.com/FreeCAD/FreeCAD}} * Drücke oben rechts auf der Seite die Taste "Fork". Dadurch wird eine persönliche Kopie des FreeCAD Repositoriums unter deinem GitHub Benutzernamen erstellt: {{URLn|https://github.com/GITHUB_USERNAME/FreeCAD}} * Klone auf deinem Rechner deine neu erstellte FreeCAD Fork. Er wird in einem Verzeichnis {{incode|freecad-source}} erstellt. {{Code|lang=text|code= git clone https://github.com/GITHUB_USERNAME/FreeCAD.git freecad-source }} * Sobald der Download abgeschlossen ist, gib das neue Quellverzeichnis ein und lege das {{incode|upstream}} Repositorium fest. {{Code|lang=text|code= cd freecad-source git remote add upstream https://github.com/FreeCAD/FreeCAD.git }} * Bestätige deine Fernrepositorien mit {{incode|git remote -v}}; die Ausgabe sollte ähnlich wie diese sein {{Code|lang=text|code= origin https://github.com/GITHUB_USERNAME/FreeCAD.git (fetch) origin https://github.com/GITHUB_USERNAME/FreeCAD.git (push) upstream https://github.com/FreeCAD/FreeCAD.git (fetch) upstream https://github.com/FreeCAD/FreeCAD.git (push) }} * Jetzt kann die Entwicklung beginnen. </div> </div> <div class="mw-collapsible mw-collapsed toccolours"> <span id="2nd_Method:_Clone_FreeCAD_directly_to_your_local_machine"></span> ====2. Methode: FreeCAD direkt auf den eigenen lokalen Rechner klonen==== <div class="mw-collapsible-content"> Zuerst wirst du das FreeCAD Repositorium in GitHub abspalten (engl.:fork ‚Gabel‘), jedoch wirst du das ursprüngliche FreeCAD Repositorium auf deinen lokalen Rechner klonen und dann deine Fernbedienungen über das Terminal ändern. * [https://github.com/join Anmelden] auf dein GitHub Konto. * Gehe zum offiziellen FreeCAD Repositorium: {{URL|https://github.com/FreeCAD/FreeCAD}} * Klicke oben rechts auf der Seite auf die "Fork" Schaltfläche. Dadurch wird eine persönliche Kopie des FreeCAD Repositoriums unter deinem GitHub Benutzernamen erstellt: {{URLn|https://github.com/GITHUB_USERNAME/FreeCAD}} * Klone das ursprüngliche FreeCAD Repositorium. Es wird in einem Verzeichnis {{incode|freecad-source}} erstellt. {{Code|lang=text|code= git clone https://github.com/FreeCAD/FreeCAD.git freecad-source }} * Sobald das Herunterladen abgeschlossen ist, gib das neue Quellverzeichnis ein und lege das {{incode|Ursprung}}s Repositorium fest. {{Code|lang=text|code= cd freecad-source git remote add origin https://github.com/GITHUB_USERNAME/FreeCAD.git }} * Richte dann das {{incode|upstream}} Repositorium ein. {{Code|lang=text|code= git remote add upstream https://github.com/FreeCAD/FreeCAD.git }} * Bestätige deine Fernrepositorien mit {{incode|git remote -v}}; die Ausgabe sollte ähnlich wie diese sein {{Code|lang=text|code= origin https://github.com/GITHUB_USERNAME/FreeCAD.git (fetch) origin https://github.com/GITHUB_USERNAME/FreeCAD.git (push) upstream https://github.com/FreeCAD/FreeCAD.git (fetch) upstream https://github.com/FreeCAD/FreeCAD.git (push) }} * Jetzt kann die Entwicklung beginnen. </div> </div> Wenn die Fernrepositorien aus irgendeinem Grund zwar existieren, aber auf die falsche Adresse verweisen, kannst du die Situation durch Umbenennen des Namens des entfernten Repositoriums beheben. Beispielsweise sollte {{incode|Ursprung}} auf deine persönliche Abspaltung zeigen; wenn er auf das ursprüngliche FreeCAD Repositorium zeigt, ändere den Namen dieses Fernrepositoriums in {{incode|upstream}} und füge das {{incode|Ursprung}}s Repositorium manuell hinzu. {{Code|lang=text|code= git remote rename origin upstream git remote add origin https://github.com/GITHUB_USERNAME/FreeCAD.git git remote -v }} Du kannst auch weitere Informationen mit dem Schlüsselwort {{incode|anzeigen}} anzeigen. {{Code|lang=text|code= git remote show origin git remote show upstream }} <span id="Git_development_process"></span> ==Git-Entwicklungsprozess== {{VeryImportantMessage|Niemals auf dem eigenen lokalen ''Master''-Zweig entwickeln. Erstelle stattdessen einen lokalen Zweig für die Entwicklung, und führe diesen lokalen Zweig dann über eine Pull-Anforderung mit dem vorgeschalteten Master-Zweig zusammen. Lies bitte [https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell Git-Verzweigung], [https://book.git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging Grundlegende Verzweigung und Zusammenführung] und [https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project GitHub - An einem Projekt mitwirken], um mehr zu erfahren.}} [[File:FreeCAD_git_branches_workflow.svg|800px]] {{Caption|Generischer Arbeitsablauf zur Entwicklung von Code für FreeCAD unter Verwendung von {{incode|git}}; das Haupt Repositorium wird online gespalten und auf einen Offline Rechner geklont (0); neue Zweige (1) werden verwendet, um lokale Änderungen und Ergänzungen des Codes zu übergeben (2); die Zweige werden auf den neuesten Online Code zurückgeführt (3), und dann zum entfernten Repositorium geschoben (4); dann wird eine Pull Anfrage erstellt, um den Code in das Haupt Repositorium einzufügen (5). Dann wird der persönliche Klon mit dem neuen Mastercode aktualisiert (a); dieser aktualisierte Mastercode wird ebenfalls an das Fernrepositorium (b) geschickt, um denselben Code sowohl online als auch offline zu haben.}} <span id="Branching"></span> === Verzweigung === Anstatt an der Masterversion des Codes zu arbeiten, empfiehlt die bewährte Methode mit Git die Erstellung eines neuen Zweiges, wann immer du an einer neuen Funktion arbeiten willst. Zweige sind kostengünstig, sie kopieren nicht den gesamten Quellcode Baum, sondern erzeugen lediglich einen Zeitpunkt, an dem Sie Code schreiben werden; daher helfen Zweige dabei, die laufende Arbeit vom Hauptcode getrennt zu halten. Die Verwendung eines neuen Zweigs erfolgt in zwei Schritten: Zuerst erstellest du den Zweig, und dann wechselst du zu ihm: {{Code|lang=text|code= git branch myNewBranch git checkout myNewBranch }} Führe alternativ beide Schritte mit einer einzigen Anweisung aus: {{Code|lang=text|code= git checkout -b myNewBranch }} Jetzt kannst du Zweige mit {{incode|checkout}} ändern, wann immer du daran arbeiten musst. Um die Zweige in deinem Projekt und dem aktuellen Zweig zu sehen, verwende die Operation {{incode|branch}} allein oder füge {{incode|-v}} oder {{incode|-vv}} für weitere Informationen hinzu: {{Code|lang=text|code= git branch git branch -vv }} Nachdem du Änderungen vorgenommen und diese Änderungen übertragen hast, verwende die Operation {{incode|log}} mit den folgenden Optionen, um die Zweige zu visualisieren {{Code|lang=text|code= git log --oneline --decorate --graph --all }} <span id="Committing"></span> === Übergeben === Sobald du dich in einem neuen Zweig befindest, bearbeite die gewünschten Quelldateien mit einem Texteditor. Um zu sehen, welche Dateien geändert wurden, verwende die Operationen {{incode|status}} und {{incode|diff}}; wenn du mit den Änderungen zufrieden bist, speichere die Änderungen mit der Operation {{incode|commit}}: {{Code|lang=text|code= git status git diff git commit -a }} Anders als bei SVN muss man ausdrücklich angeben, welche Dateien übergeben werden; mit der Option {{incode|-a}} werden alle geänderten Dateien gespeichert. Der voreingestellte Texteditor, z.B. {{incode|nano}} oder {{incode|vim}}, wird zum Verfassen einer Überabemitteilung geöffnet. Alternativ fügt man die Mitteilung der Übergabeanweisung hinzu: {{Code|lang=text|code= git commit -a -m "Fix the bug in the clone function." }} Werden neue Dateien oder Verzeichnisse erstellt, muss zuerst die Aktion {{incode|add}} ausgeführt werden, die sie zum lokalen Projektarchiv hinzufügt, bevor die Änderungen übergeben werden. {{Code|lang=text|code= git add path git commit -a }} Wobei {{incode|path}} eine beliebige Datei oder ein beliebiges Verzeichnis sein kann. <span id="Writing_good_commit_messages"></span> ===Gute Übergabemitteilungen schreiben=== You should try to work in small steps, that is, commit often, after a small addition in your code. If you cannot summarize your changes in one sentence, then it has probably been too long since you made a commit. For big changes, it is important that you have helpful and useful descriptions of your work. FreeCAD has adopted a format mentioned in the [https://git-scm.com/book/en/v2 Pro Git] book, which consists of a short message, and then a larger descriptive paragraph. {{Code|lang=text|code= Short (50 chars or less) summary of changes More detailed explanatory text, if necessary. Wrap it to about 72 characters or so. In some contexts, the first line is treated as the subject of an email and the rest of the text as the body. The blank line separating the summary from the body is critical (unless you omit the body entirely); tools like rebase can get confused if you run the two together. Further paragraphs come after blank lines. - Bullet points are okay, too - Typically a hyphen or asterisk is used for the bullet, preceded by a single space, with blank lines in between, but conventions vary here }} If you are doing a lot of related work in a branch, you should make many small commits (see a [https://forum.freecadweb.org/viewtopic.php?f=10&t=2062&p=14887#p14886 forum post]). When you want to merge those changes into the master branch, you should issue {{Code|lang=text|code= git log master..myNewBranch }} um die einzelnen Übergabe Meldungen zu sehen. Dann kannst du eine Nachricht von hoher Qualität schreiben, wenn eine Zusammenführung durchgeführt wird. When you merge to master use the {{incode|--squash}} option and commit with your quality commit message. This will allow you to be very liberal with your commits and help to provide a good level of detail in commit messages without so many distinct descriptions. === Squashing commits === Squashing refers to the process of combining various consecutive commits into one. This may be desirable if you made many small commits that you want to present as a single commit, for example, when changing a single variable, correcting spelling mistakes, and adjusting the spacing of the code. You should squash only small commits to a single file; big changes to the code across multiple files should contain the full commit history. With {{incode|git log --oneline}} you can see many commits in sequence, with the newest commit on top. In this example, starting from "feature A" many commits are made to implement "feature B"; we would like to squash all commits belonging to "feature B" into one. {{Code|lang=text|code= 871adb OK, feature B is fully implemented 1c3317 Whoops, it is not ready yet... 87871a I'm almost ready! 643d0e Code cleanup af2581 Fix this and that 4e9baa Good implementation d94e78 Prepare the module for feature B 6394da Feature A }} Use the {{incode|rebase}} operation with the {{incode|--interactive}} or {{incode|-i}} option to select various commits and squash them. Use the hash of the commit just before the first one that you want to squash, in this case the one corresponding to "feature A". {{Code|lang=text|code= git rebase -i 6394da }} (TIP: If you know how many commits you want to edit, you can use {{incode|git rebase -i HEAD~n}} to work on the last {{incode|n}} commits) The command line editor, like {{incode|nano}} or {{incode|vim}}, will open to show you the commits again, now with the older commit on top. Before each commit, the word {{incode|pick}} will be shown. Delete the word {{incode|pick}}, and write the word {{incode|squash}} or just the letter {{incode|s}} instead, with the exception of the first entry; this commit is the oldest one, so all future commits will be squashed into it. {{Code|lang=text|code= pick d94e78 Prepare the module for feature B s 4e9baa Good implementation s af2581 Fix this and that s 643d0e Code cleanup s 87871a I'm almost ready! s 1c3317 Whoops, it is not ready yet... s 871adb OK, feature B is fully implemented }} Save the file and close the editor. The editor will open up again. Now you can add a longer message that describes all changes as if they were a single commit. Save the file and close the editor once more. This will finish combining those commits into one, with the new commit message that you wrote. You can use {{incode|git log --oneline}} again to observe the new commit history. In this case only a single commit for "feature B" will appear, on top of the unmodified commit for "feature A". {{Code|lang=text|code= c83d67 OK, feature B is fully implemented now, with proper module setup, and clean code. 6394da Feature A }} When coding for FreeCAD, we ask that you begin each commit message with the module that it affects. For example, a commit message for a change to sketcher might be: <pre> Sketcher: make straight lines curve a bit Straight lines are sort of ugly, so this commit adds a little bit of curvature to them, so they are more visually pleasing. They also sparkle some, and change colors over time. Fixes bug #1234. </pre> Your PR will be easier to review, and faster to be merged, if you are careful to use rebase to structure and describe your commits before submitting. === Pushing your work to your GitHub repository === The local branches in your computer aren't automatically synchronized with the remote servers that you have specified as {{incode|origin}} or {{incode|upstream}} (see [[#Remote repositories|Remote repositories]]); you have to explicitly push the branches to the remote servers, for which you must have write access. Once you do this, the branches become public, and available for review by other developers. For FreeCAD, you should push your local branch to the {{incode|origin}} remote repository, that is, {{URLn|https://github.com/GITHUB_USERNAME/FreeCAD}}. You need to enter your username and password every time you push, unless you have set up [https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage#_credential_caching Credential caching]. Please read [https://help.github.com/articles/pushing-to-a-remote/ Pushing commits to a remote repository] for more information. {{Code|lang=text|code= git push origin myNewBranch }} When you work with a single branch, you may need to interactively rebase, squash, and fix commits many times. In this case, your branch history will not be simple, and you will not be able to push it to the remote repository. You may get a message like the following, saying that it is not possible to do a "fast-forward" push. {{Code|lang=text|code= error: failed to push some refs to 'https://github.com/USER/FreeCAD.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. }} In order to finally push your branch to the remote repository you need to "force push" it. This will completely overwrite your remote branch with the actual branch that you have offline. {{Code|lang=text|code= git push -f origin myNewBranch }} The regular developer doesn't have write access to the {{incode|upstream}} repository {{URL|https://github.com/FreeCAD/FreeCAD}}, therefore, you should never push code to this remote server. === Rebasing from upstream === While you work on your own branch, the official FreeCAD code keeps "moving forward" with commits from other developers, and thus starts diverging from the code that you have in your personal fork. <!--NOT CHANGE THE <pre> </pre> BALISE CAUSE THE SPACE IN MACRO CODE IS NOT RESPECTED--> <pre> .-----A origin/myNewBranch / -----o-----------Z FreeCAD upstream/master </pre> Therefore, when you are ready to merge your branch to the main FreeCAD repository, you must "rebase" your own copy of the repository, so that it is as close as possible to the official repository. See [https://git-scm.com/book/en/v2/Git-Branching-Rebasing Git Branching - Rebasing] for more information. {{Code|lang=text|code= git checkout myNewBranch git pull --rebase upstream master }} This will download the code from the {{incode|master}} branch of the {{incode|upstream}} repository (the official FreeCAD source), and will merge it with your current branch ({{incode|myNewBranch}}), so that your changes will appear on top of the latest official code. If nobody modified the same files that you did, then the merge will succeed without problems. If some files were changed at the same time by different people, there may be a conflict that needs to be resolved. <!--NOT CHANGE THE <pre> </pre> BALISE CAUSE THE SPACE IN MACRO CODE IS NOT RESPECTED--> <pre> .-----A' origin/myNewBranch / -----o-----------Z FreeCAD upstream/master </pre> To summarize, you need to be in the appropriate branch, rebase the upstream code, and then proceed with the push. {{Code|lang=text|code= git checkout myNewBranch git pull --rebase upstream master git push origin myNewBranch }} The {{incode|pull}} operation is equivalent to a {{incode|fetch}} followed by a {{incode|merge}}. When the {{incode|--rebase}} option is used, instead of doing a simple {{incode|merge}}, it runs the {{incode|rebase}} operation. {{Code|lang=text|code= git pull upstream git fetch upstream git merge FETCH_HEAD }} {{Code|lang=text|code= git pull --rebase upstream master git fetch upstream git rebase master }} === Merging the branch (pull request) === Once you have committed your changes locally, rebased your branch from the upstream repository, and pushed your branch online, you can initiate a "pull request". A [https://help.github.com/articles/about-pull-requests/ pull request] tells the administrators of the official FreeCAD repository that you want to merge the new code in your branch with the official code. To recap, the development process looks like this: # Fork FreeCAD and get a local copy of that fork. # Create a branch on your fork and change to that branch. # Code! Commit and much or as little as you like, writing good commit messages to keep track of what you are doing. # When you are satisfied with your work, use {{incode|git rebase -i HEAD~n}} (where n is the total number of commits you've made) to collapse your commits into a logical set with good commit messages (each message should begin with the name of the module it affects, e.g. "Sketcher: make straight lines curve a bit"). # Use GitHub to submit your code as a "Pull Request (PR)" as described below. As soon as you push the code to your {{incode|origin}} repository {{URLn|https://github.com/GITHUB_USERNAME/FreeCAD}}, GitHub will give you the option of comparing and creating a pull request against the {{incode|upstream}} repository. By pressing {{Button|Compare & pull request}} you will open an interface that will allow you to pick which repository is the "base", target of the merge, and which is the "head", your additional code. A quick check will be done by the system telling you if there are no conflicts with the files that you modified; if you worked on files that nobody has touched, your branch will be able to merge cleanly. GitHub will show you a text editor so you can write a message documenting your changes: this editor will be pre-filled with a welcome message (that you can delete), a checklist (that you should go through), and a reminder to document your change on the wiki when it's accepted. To use the checklist, go through each item in turn and change the {{incode|[ ]}} to {{incode|[X]}} to indicate that you've done that step. GitHub will also display the number of commits in your branch, the number of files that were modified, and a view showing you the differences between the "base" and the "head" so that everybody can immediately see your intended modifications. Double-check these for things like stray blank lines you didn't mean to add, or huge formatting changes that your IDE decided to make behind your back. {{Code|lang=text|code= base repository: FreeCAD/FreeCAD base: master <---- head repository: GITHUB_USERNAME/FreeCAD compare: myNewBranch Able to merge. These branches can be automatically merged. }} Click {{Button|Create pull request}} to proceed. A message will appear indicating that some checks need to be done on the code. This is a system that compiles FreeCAD automatically and runs the unit tests. If the tests pass, the pull request will have a better chance of being merged into the main code, otherwise a report will be made indicating the errors encountered. See [https://travis-ci.org/FreeCAD/FreeCAD/pull_requests FreeCAD pull requests]. <!--NOT CHANGE THE <pre> </pre> BALISE CAUSE THE PIPE OR SPACE IN MACRO CODE CUT THE MACRO--> <pre> Some checks haven’t completed yet * continuous-integration/travis-ci/pr Pending — The Travis CI build is in progress |Required| </pre> If the tests succeed, you will see a message such as the following All checks have passed <!--NOT CHANGE THE <pre> </pre> BALISE CAUSE THE PIPE OR SPACE IN MACRO CODE CUT THE MACRO--> <pre> * continuous-integration/travis-ci/pr — The Travis CI build passed |Required| </pre> This branch has no conflicts with the base branch Only those with write access to this repository can merge pull requests. Now you must wait for the administrators to merge your branch; you will be notified when this happens. {{Code|lang=text|code= Pull request successfully merged and closed You’re all set — the GITHUB_USERNAME:myNewBranch branch can be safely deleted. If you wish, you can also delete your fork of FreeCAD/FreeCAD. }} If you wish, you may delete the branch that was just merged, or even your entire FreeCAD fork, as your own code is already included at the end of the master branch. {{Code|lang=text|code= -----o-----------Z----A' FreeCAD upstream/master }} {{Emphasis|Note:}} you may continue working ({{incode|git commit -a}}) on the same branch while you wait for merge approval; if you {{incode|git push}} again, a second merge commit will be queued in the same pull request, and another automated test will be done. That is, while your merges aren't yet approved by the administrators, you may keep pushing changes to your {{incode|origin}} repository, and this will queue those commits in the same pull request to the {{incode|upstream}} repository. Using a single pull request to queue many individual commits is often desirable for small changes. For big additions to the source code, you should create another branch, develop your features there, and then submit a separate pull request for this branch. The pull request interface can be used whenever you want to submit code from your own repositories to another repository in GitHub. You can use it to merge code in the opposite direction as well, from other people's branches to your own, or even between your own branches. In the last case, since you own the branches, the merges can be approved by yourself immediately. {{Code|lang=text|code= base repository: SomeProject/Some_Software base: master <---- head repository: GITHUB_USERNAME/Some_Software compare: add_new_functions base repository: GITHUB_USERNAME/FreeCAD base: myNewBranch <---- head repository: FreeCAD/FreeCAD compare: master base repository: GITHUB_USERNAME/FreeCAD base: myNewBranch <---- head repository: GITHUB_USERNAME/FreeCAD compare: fix-many-bugs-branch }} <span id="Keeping_the_GitHub_repository_up_to_date"></span> === Das GitHub Repositorium auf dem neuesten Stand halten === Once you've forked FreeCAD, your personal repository exists independently from the original. When the original repository has new commits, GitHub will inform you that your personal repository is behind in number of commits: {{Code|lang=text|code= This branch is 5 commits behind FreeCAD:master. }} In similar way, if you created a development branch with new code, GitHub will inform you that this branch is ahead in number of commits; that is, this branch has changes that haven't been merged into the official FreeCAD repository: {{Code|lang=text|code= This branch is 3 commits ahead of FreeCAD:master. }} While developing, both cases are possible, as your own branch may lack commits made by other developers, but include new commits by you: {{Code|lang=text|code= This branch is 2 commits ahead, 14 commits behind FreeCAD:master. }} When developing code it is recommended that you rebase the branch in which you are currently working, as that will put your branch always ahead of the FreeCAD master code. As for your original {{incode|master}} branch, it will never be automatically updated by GitHub; this is something that you must do yourself. Switch to the {{incode|master}} branch, then {{incode|pull}} from {{incode|upstream}} (which performs a {{incode|fetch}} and {{incode|merge}}), and then push this updated {{incode|master}} branch to your remote {{incode|origin}} repository. {{Code|lang=text|code= git checkout master git pull upstream master git push origin master }} After this is done, GitHub will let you know that your are synchronized with the {{incode|upstream}} repository. {{Code|lang=text|code= This branch is even with FreeCAD:master. }} Now that your {{incode|master}} is up to date, you may decide to switch to it, and delete the other branch that you used previously to develop a feature. {{Code|lang=text|code= git checkout master git branch -d myNewBranch }} To delete the branch in the {{incode|origin}} remote repository, you can use the {{incode|push}} operation. Normally, you push a local branch; this creates a remote branch with the same name as your local branch. {{Code|lang=text|code= git push origin myNewBranch }} However, if you use the notation {{incode|local_name:remote_name}}, the local branch is created in the remote repository under a different name: {{Code|lang=text|code= git push origin myNewBranch:someRemoteBranch }} Daher kannst du den entfernte Fernzweig löschen, indem du einen leeren lokale Zweig schiebst: {{Code|lang=text|code= git push origin :myNewBranch git push origin :someRemoteBranch }} Now that you only have an up-to-date {{incode|master}}, you can create a new branch, and repeat the steps of changing files, committing, pushing, submitting a pull request, merging, and updating. {{Code|lang=text|code= git checkout master git checkout -b anotherBranch }} If you don't want to delete your already custom branch, you may force updating it to be equal to the updated {{incode|master}}; then you can do whatever you want with it, including adding more commits and pushing it to the remote {{incode|origin}} repository. {{Code|lang=text|code= git checkout myNewBranch git reset --hard master git push -f origin myNewBranch }} Hard resetting a branch like this is usually not needed. In most cases, you want to follow the sequence of creating a new branch, committing changes, pushing those changes, merging the branch, and then deleting the branch. <span id="Advanced_Git_operations"></span> == Erweiterte Git Operationen == <span id="Searching"></span> === Suchen === Some handy tools to help you find what you're looking for: <span id="Search_filenames"></span> ==== Dateinamen suchen ==== Use {{incode|git ls-files}} to search the repository for file that contains a certain string in a filename. The example below will return all instances of the files that contain the 'dxf' in their filenames. {{Code|lang=text|code= git ls-files *dxf* }} <span id="Search_for_a_string"></span> ==== Suche nach einer Zeichenkette ==== Use {{incode|git grep}} to search the repository for file that contains a certain string with the files themselves. The example below will return all instances of the files that contain the 'dxf' within each and every file. {{Code|lang=text|code= git grep dxf }} <span id="Resolving_merge_conflicts"></span> === Auflösen von Zusammenführungskonflikten === Merging branches with {{incode|git merge}}, or rebasing your branch with {{incode|git rebase}}, will occasionally present conflicts, as files may have been modified by another author at the same time. If this happens you should see the changes of both sides, the other author's, and your own, and then make a decision on how to include both sets of changes in the best way possible. This is normally a manual process that cannot be automated; the programmer must understand the code, and decide what code to move, re-write, or drop to solve the conflict. Sobald ein Konflikt auftritt, kann eine Meldung wie diese erscheinen. {{Code|lang=text|code= CONFLICT (content): Merge conflict in src/Mod/source_code.py error: Failed to merge in the changes. Patch failed at 1234 Some commit message when editing source_code.py }} If a specialized diff tool is installed and configured for Git, for example, Gnome's [https://wiki.gnome.org/Apps/Meld Meld], the conflict can be examined and solved by using the {{incode|mergetool}} operation. {{Code|lang=text|code= git mergetool }} The Meld tool normally displays three columns; the two columns on the sides display the two conflicting files, while the column on the middle displays the new code that will be saved and committed finally. Therefore, this central column should be edited in a way that it integrates the code of both side columns. Once the conflict is solved and the new source code (the central column) is saved, the Meld tool can be closed. Then the {{incode|merge}} or {{incode|rebase}} operation can continue. {{Code|lang=text|code= git merge --continue git rebase --continue }} For more information on merging and solving conflicts see: * [https://git-scm.com/docs/git-merge#_how_conflicts_are_presented How merge conflicts are presented] with {{incode|git merge}}. * [https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts Basic merge conflicts] and [https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging Git Tools - Advanced Merging]. * [https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ Resolving a merge conflict using the command line]. * [https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_external_merge_tools External merge and diff tools] to use when you encounter a Git conflict. <span id="Inspect_changes"></span> === Änderungen untersuchen === Inspect the history of a single file through various commits with the {{incode|log}} operation: {{Code|lang=text|code= git log --patch path }} Where {{incode|path}} can be any directory or file. Instead of {{incode|--patch}}, also the shorthands {{incode|-p}} or {{incode|-u}} can be used. <span id="Inspect_changes_between_two_branches"></span> === Änderungen zwischen zwei Zweigen untersuchen === Inspect the changes between two branches with the {{incode|log}} and {{incode|diff}} operations with the names of the branches: {{Code|lang=text|code= git log master..myBranch git diff master..myBranch }} The {{incode|log}} operation shows the commits, while {{incode|diff}} shows the actual changes in the files. <span id="Reset_files_and_directories"></span> === Dateien und Verzeichnisse zurücksetzen === If you accidentally made modifications to a file or directory, you may want to completely revert these changes, to get the previous state of the source code. This can be done quickly using the {{incode|checkout}} operation: {{Code|lang=text|code= git checkout path git checkout . }} This will restore the {{incode|path}} (a file or a directory) to the state it is at the tip of the branch, discarding changes that haven't been committed. If {{incode|path}} is the single dot {{incode|.}}, it will restore all files in the current directory. If you have accidentally added files and directories you can use the {{incode|clean}} operation: {{Code|lang=text|code= git clean -df }} This will forcefully delete all files and directories ({{incode|-df}}) that are not being tracked by the repository, that is, those that have not been included previously with the {{incode|add}} operation. To completely reset the repository, losing all uncommitted modifications, use the {{incode|reset}} operation: {{Code|lang=text|code= git fetch git reset --hard FETCH_HEAD }} Where {{incode|FETCH_HEAD}} is the the tip of the {{incode|upstream}} repository. Another commit can also be used. The {{incode|revert}} operation also reverts changes. However, this command does this by adding another commit to the history; in many cases this is not desired. <span id="Pruning_old_branches"></span> === Beschneiden alter Zweige === If you have committed many branches to the {{incode|upstream}} repository, you may wish to remove these branches from your local system as they have already been merged. The branch in the {{incode|origin}} repository online can be deleted immediately after merging. Then you can remove the local references to that branch, using the {{incode|--prune}} or {{incode|prune}} options to the {{incode|fetch}} and {{incode|remote}} operations. {{Code|lang=text|code= git fetch --prune origin git remote prune origin }} Schließlich kannst du die Zweige lokal löschen {{Code|lang=text|code= git branch -D myBranch }} It is also a good practice to do garbage collection after a while, by using the {{incode|gc}} operation. This will cleanup unnecessary files, and compress local file revisions, in order to optimize local disk usage of the repository. {{Code|lang=text|code= git gc }} <span id="Working_with_patches"></span> === Arbeiten mit Patches === Obwohl Git Ihnen dir erlaubt, verschiedene Code Zweige mit {{incode|git merge}} zusammenzuführen (in deinem Computer) oder einer Pull Anfrage (Fernrepositorium) gibt es Zeiten, in denen es wünschenswert sein kann, einen traditionellen "Patch" zu erstellen, der als Anhang per Email verschickt werden kann. Der folgende Arbeitsablauf erklärt, wie dies zu tun ist. <span id="Creating_patches"></span> ==== Patches erstellen ==== * You should be developing your new code in a secondary branch of your repository, and not in the master branch. So the first step is to make sure you are in the correct branch. {{Code|lang=text|code= git branch -v git checkout myBranch }} * Now use {{incode|git format-patch}} against the master branch, and use the {{incode|--stdout}} option to redirect the result to standard output; then redirect the standard output to a file, which for convenience is created above the source code directory. {{Code|lang=text|code= git format-patch master --stdout > ../myCode.patch }} * Eine andere Methode ist {{Code|lang=text|code= git format-patch HEAD^ git format-patch HEAD~1 }} The number of circumflex carets {{incode|^}} or the number {{incode|1}} indicate the number of commits that should be considered, that is, {{incode|^^^}} or {{incode|~3}} will create three patches for three commits. {{Code|lang=text|code= git format-patch HEAD^ }} This will create a patch or series of patches with the following naming convention {{Code|lang=text|code= XXXX-commit-message.patch }} where {{incode|XXXX}} is a number from {{incode|0000}} to {{incode|9999}}, and the commit message forms the majority of the file name, for example, {{Code|lang=text|code= 0001-fix-ViewProjMatrix-getProjectionMatrix.patch }} <span id="Applying_patches"></span> ==== Patches anwenden ==== Git can merge patches or diffs. To know more about this process read [https://www.drupal.org/node/1399218 Applying patches with Git]. Wenn du die Patch Datei bereits in deinem System hast, wende sie einfach an. {{Code|lang=text|code= git apply myCode.patch }} You can use {{incode|curl}} to download a patch from a website, and then apply it through {{incode|git}}. {{Code|lang=text|code= curl -O https://some.website.org/code/myCode.patch git apply myCode.patch }} Add {{incode|.diff}} or {{incode|.patch}} at the end of the URL of a GitHub commit, pull request, or compare view so that the website shows you the plain text view of that page. * Regular commit page: {{URL|https://github.com/FreeCAD/FreeCAD/commit/c476589652a0f67b544735740e20ff702e8d0621}} * Diff page: {{URL|https://github.com/FreeCAD/FreeCAD/commit/c476589652a0f67b544735740e20ff702e8d0621.diff}} * Patch page: {{URL|https://github.com/FreeCAD/FreeCAD/commit/c476589652a0f67b544735740e20ff702e8d0621.patch}} You can point {{incode|curl}} to a particular commit patch in the repository, and pipe it directly to {{incode|git}} to apply the patch. <pre> curl https://github.com/FreeCAD/FreeCAD/commit/c476589652a0f67b544735740e20ff702e8d0621.patch | git apply - </pre> <span id="Reversing_a_patch"></span> ==== Einen Patch rückgängig machen ==== When you apply a patch you modify some files. However, these modifications aren't permanent until you commit the changes. Therefore, if you want to revert a patch use the following instructions. This will revert the changes applied, if you still have access to the original patch file. {{Code|lang=text|code= git apply -R myCode.patch }} Alternatively, this will remove non-committed changes to the branch. {{Code|lang=text|code= git checkout -f }} === Stashing git commits === Say that you're working on a branch and you find yourself making some modifications to the source that are out of the scope of your current branch; in other words, those changes would be better in another branch instead of the current one. The {{incode|git stash}} command can be used to temporarily store those uncommitted local changes. {{Code|lang=text|code= git stash }} If in the future you want to use those commits, you can "pop" the commits out of the stash, and into your working branch. {{Code|lang=text|code= git stash pop }} Or if you decide that you don't like those saved commits anymore, you may drop the commits from the stash entirely. {{Code|lang=text|code= git stash drop }} You can list multiple stash commits with {{Code|lang=text|code= git stash list }} To learn more, read [https://medium.freecodecamp.org/useful-tricks-you-might-not-know-about-git-stash-e8a9490f0a1a Useful tricks you might not know about Git stash]. <span id="Check_out_GitHub_requests_locally"></span> === GitHub Anfragen lokal herausfinden === [https://gist.github.com/piscisaureus/3342247 Checkout GitHub pull requests locally] === Blaming === {{VeryImportantMessage|Section TBD}} Add content from https://forum.freecadweb.org/viewtopic.php?f=23&t=55943&p=481483#p481287 === Bisect === {{incode|git bisect}} is a method to find the specific commit that introduced a bug. You need to find 2 commits: * A good commit (for example {{incode|abcd}}) before the system broke. * A bad commit (for example {{incode|efgh}}) after the system broke. Then enter this from the terminal: {{Code|lang=text|code= git bisect start git bisect good abcd git bisect bad efgh }} Result: {{incode|git}} will check out the mid point between the two commits. The next step is to build and test the code. If the system works, continue the process by typing: {{Code|lang=text|code= git bisect good }} Repeat the previous step of building the code and testing it. If the system is broken, type: {{Code|lang=text|code= git bisect bad }} Repeat the previous steps applying {{incode|good}} or {{incode|bad}} depending on the outcome of your tests. Eventually, {{incode|git}} will tell you that {{incode|wxyz}} is the first bad commit. Finally, to exit the bisect process, type: {{Code|lang=text|code= git bisect reset }} Note: {{incode|git bisect}} takes a long time if good and bad are far apart. <span id="FreeCAD_revision_number"></span> == FreeCAD Revisionsnummer == In contrast to subversion, which uses a consecutive number for its revisions, Git produces [https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash values] with every commit. A hash value is a long alphanumeric string that looks like this {{Code|lang=text|code= 9b3ffef570596e184006287434fba54a4b03ccc3 }} <span id="Latest_revision_number"></span> === Letzte Revisionsnummer === To find the latest revision number of a particular branch use the {{incode|rev-list}} operation with the {{incode|--count}} option. Give the name of the branch, remote repository, tag, or a special pointer like {{incode|HEAD}}, to indicate the last commit in that particular object. {{Code|lang=text|code= git rev-list --count master git rev-list --count HEAD git rev-list --count origin }} Or browse [https://github.com/FreeCAD/FreeCAD the repository on GitHub], and read the amount of commits reported in the particular branch. <span id="Revision_number_of_a_specific_commit_hash"></span> === Revisionsnummer eines bestimmten Commit Hashes === Since the hash is an alphanumeric string it is not very useful to decide if a certain commit is older or newer than another hash. To find the revision number of a particular hash, again use the {{incode|rev-list}} operation; the input can be the full hash, or a partial hash that is unique, usually the first 7 digits are enough. {{Code|lang=text|code= git rev-list --count ab1520b872821414c6ce4a15fb85d471ac2a2b03 git rev-list --count 9948ee4 }} <span id="Revision_hash_of_a_specific_commit_number"></span> === Revisions Hash einer bestimmten Commit Nummer === If we have the commit number, say, 15000, and we want to find the corresponding hash, we need to calculate the number of commits since this point until the last commit ({{incode|HEAD}}). First, get the latest commit number. {{Code|lang=text|code= git rev-list --count HEAD 17465 }} Then subtract the commit that we want. {{Code|lang=text|code= 17465 - 15000 = 2465 }} Then use the {{incode|log}} operation to show all commits and hashes. The {{incode|--skip}} option jumps the difference in commits that we calculated so that we go directly to the hash that we are looking for. {{Code|lang=text|code= git log --skip=2465 commit 44c2f19e380e76b567d114a6360519d66f7a9e24 }} Since the log may show you two close commits, confirm it's the right commit number. If it's off by one, just pick the next commit in the sequence (before or after) and check again. {{Code|lang=text|code= git rev-list --count 44c2f19e38 15000 }} * [https://forum.freecadweb.org/viewtopic.php?f=10&t=26673 Show the commits] immediately before a particular commit in GitHub: in the address bar of the browser, change the word {{incode|commit}} to {{incode|commits}} to show a list. * [https://forum.freecadweb.org/viewtopic.php?t=5308 Finding the revision number of the commit] * [https://forum.freecadweb.org/viewtopic.php?f=18&t=12883&p=103207#p103203 Finding the revision number of the commit] * [https://forum.freecadweb.org/viewtopic.php?f=10&t=31118 Finding the corresponding hash value to a particular commit number] <span id="Revision_number_in_FreeCAD's_interface"></span> === Revisionsnummer in der FreeCAD Oberfläche === Die Versionsnummer, die mit dem [[Std_About/de|Std Über]] Werkzeug angezeigt wird, ist in {{incode|src/Build/Version.h}} definiert, was zur Kompilierzeit erstellt wird, wenn das Werkzeug {{incode|cmake}} ausgeführt wird. Lies [https://forum.freecadweb.org/viewtopic.php?f=4&t=3025 Versionsnummer aus der Git Quelle extrahieren] für weitere Informationen. <span id="Adding_other_repositories_(remotes)"></span> == Hinzufügen weiterer (Fern) Repositorien == Mehrere Mitarbeiter des FreeCAD Projekts haben ihre eigenen Git Repositorien, in denen sie ihre Arbeit aufbauen oder neue Ideen ausprobieren, bevor sie bereit sind, in den offiziellen Quellcode aufgenommen zu werden. Vielleicht möchtest du ihre Quellen bekommen, um ihren Code selbst zu testen, wenn sie eine Pull Anfrage stellen. Verwende den Befehl {{incode|git fern}} Befehl, um diese anderen Repositorien hinzuzufügen, so dass du deren Code {{incode|holen}} und {{incode|abrufen}} kannst. {{Code|lang=text|code= git checkout master git remote add OTHER_USER OTHER_URL git fetch OTHER_USER git checkout -b OTHER_BRANCH OTHER_USER/OTHER_BRANCH }} Lass uns zum Beispiel Bernds Fernrepositorium hinzufügen: {{Code|lang=text|code= git remote add bernd http://github.com/berndhahnebach/FreeCAD_bhb }} Der {{incode|git holen}} Befehl lädt die Referenzen von diesem Fernrepositorium herunter. {{Code|lang=text|code= git fetch bernd }} Liste alle Zweige in deinem eigenen Repositorium und die von deinen hinzugefügten Fernen auf. Bernds Zweige werden als {{incode|Fern/bernd/<Zweigname>}} angezeigt. {{Code|lang=text|code= git branch -a }} Lass uns nun eine zusammenfassende Liste der letzten 10 Commits von bernds {{incode|femdev}} Zweig ansehen. {{Code|lang=text|code= git log -10 --oneline remotes/bernd/femdev }} Jetzt können wir den gewünschte Zweig zur Inspektion herausfinden. {{Code|lang=text|code= git checkout remotes/bernd/femdev }} Dann können wir einen lokalen Zweig erstellen, der auf dem entfernten Zweig basiert. Diesen lokalen Zweig können wir modifizieren und unseren eigenen Code hinzufügen. {{Code|lang=text|code= git checkout -b local_branch_name /remotes/bernd/femdev }} Du kannst den {{incode|git rebase}} des neu erhaltenen Zweigs auf den {{incode|upstream/master}} Zweig umstellen, um sicherzustellen, dass er den neuesten Code verwendet. Wenn es Konflikte gibt, müssen diese an diesem Punkt gelöst werden. {{Code|lang=text|code= git pull --rebase upstream master }} Der neue Zweig ist bereit, modifiziert und kompiliert zu werden, wie in [[Compiling/de|Kompilieren]] beschrieben. Besuche die Entwicklungsabteilung des [https://forum.freecadweb.org/viewforum.php?f=6 FreeCAD Forum]s, um mehr über die Entwicklung zu erfahren. <span id="Further_reading"></span> == Weiterführende Literatur == * [[Developing FreeCAD with GitKraken/de|FreeCAD mit GitKraken entwickeln]], eine Anleitung zur Verwendung einer grafischen Oberfläche mit Git. * [https://wiki.spheredev.org/index.php/Git_for_the_lazy Git für die Faulpelze], eine sehr prägnante Anleitung zu den wichtigsten Befehlen von {{incode|git}}. * Das [https://git-scm.com/book Pro Git Buch], ein quelloffenes Buch, das dich über Git lehrt; es ist in elektronischer und gedruckter Version erhältlich. * Der [https://marklodato.github.io/visual-git-guide Visual Git Leitfaden], eine Referenz mit Diagrammen, die die häufigsten Operationen mit Git erklären. * [https://www.youtube.com/watch?v=HVsySz-h9r4 Git Tutorium für Anfänger: Kommandozeilen Grundlagen], Video von Corey Schafer. * [https://www.youtube.com/watch?v=uR6G2v_WsRA Einführung in Git - Kernkonzepte], Video von David Mahler. [[Category:Developer Documentation{{#translation:}}]] {{clear}}