Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
git-rfc3161
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CSG
git-rfc3161
Commits
Commits · v1.0rc3
v1.0rc3
Select Git revision
Selected
v1.0rc3
Branches
6
passt
default
master
pu
todo
next
maint
Tags
20
v2.8.0-rc1
v2.8.0-rc0
v2.7.2
v2.7.1
v2.7.0
v2.6.5
v2.7.0-rc3
v2.7.0-rc2
v2.7.0-rc1
v2.7.0-rc0
v2.6.4
v2.6.3
v2.6.2
v2.6.1
v2.3.10
v2.5.4
v2.4.10
v2.6.0
v2.6.0-rc3
v2.5.3
27 results
git-rfc3161
git-merge-resolve.sh
Author
Search by author
Any Author
authors
CSG
CSG
Phillip Raffeck
sy79gysy
2 authors
Browse files
Oct 03, 2005
[PATCH] Enable and fix support for base less merges.
· 88f8f0a5
Fredrik Kuivinen
authored
Oct 3, 2005
88f8f0a5
Sep 11, 2005
Use Daniel's read-tree in the merge strategy 'resolve'.
· 2276aa6c
Junio C Hamano
authored
Sep 11, 2005
2276aa6c
Multi-backend merge driver.
· 91063bbc
Junio C Hamano
authored
Sep 8, 2005
91063bbc
Loading
Fredrik Kuivinen authored
Junio C Hamano authored
Junio C Hamano authored