Git with a cup of tea, painless self-hosted git service
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Lunny Xiao 1463426a27
Use merge tree to detect conflicts when possible (#36400)
2 days ago
..
check.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
check_test.go Remove incorrect "db.DefaultContext" usages (#35366) 5 months ago
comment.go Fix review request webhook bug (#35339) (#35723) 3 months ago
commit_status.go Add ability to download subpath archive (#36371) 2 weeks ago
commit_status_test.go Fix required contexts and commit status matching bug (#34815) 7 months ago
edits.go
lfs.go Refactor git command stdio pipe (#36422) 1 week ago
main_test.go
merge.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_ff_only.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_merge.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_prepare.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_rebase.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_squash.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_test.go Always use an empty line to separate the commit message and trailer (#34512) 8 months ago
merge_tree.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
merge_tree_test.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
patch.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
patch_unmerged.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
protected_branch.go Use git model to detect whether branch exist instead of gitrepo method (#35459) 3 months ago
pull.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
pull_test.go Remove incorrect "db.DefaultContext" usages (#35366) 5 months ago
review.go Refactor GetRepoRawDiffForFile to avoid unnecessary pipe or goroutine (#36434) 1 week ago
review_test.go Remove incorrect "db.DefaultContext" usages (#35366) 5 months ago
reviewer.go Fix team permissions (#34827) 7 months ago
reviewer_test.go Remove incorrect "db.DefaultContext" usages (#35366) 5 months ago
temp_repo.go Use merge tree to detect conflicts when possible (#36400) 2 days ago
update.go Fix various permission & login related bugs (#36002) 2 months ago
update_rebase.go Use merge tree to detect conflicts when possible (#36400) 2 days ago