History for GitBucket / src / main / scala / gitbucket / core / service / MergeService.scala
2018-06-30
@xuwei-k
use foreach instead of map
xuwei-k committed on 30 Jun 2018
2018-04-01
@xuwei-k
add -Xfuture option. fix warnings ...
xuwei-k committed on 1 Apr 2018
@Naoki Takezoe
Apply scalafmt
Naoki Takezoe committed on 1 Apr 2018
2018-03-17
@peccu
set filename in conflict message as code
peccu committed on 17 Mar 2018
2018-01-11
@Naoki Takezoe
(refs #1838) Fix rebase merge
Naoki Takezoe committed on 11 Jan 2018
2017-12-12
@Naoki Takezoe
Fix message
Naoki Takezoe committed on 12 Dec 2017
@Naoki Takezoe
Fix merge failure
Naoki Takezoe committed on 12 Dec 2017
@Naoki Takezoe
Merge branch 'master' into show-conflict-files
Naoki Takezoe committed on 12 Dec 2017
@Naoki Takezoe
Update reflog message
Naoki Takezoe committed on 12 Dec 2017
2017-12-11
@Naoki Takezoe
Show conflicting files
Naoki Takezoe committed on 11 Dec 2017
@Naoki Takezoe
Refactoring
Naoki Takezoe committed on 11 Dec 2017
@Naoki Takezoe
Fix rebase process
Naoki Takezoe committed on 11 Dec 2017
@Naoki Takezoe
Implemented squash merge strategy
Naoki Takezoe committed on 11 Dec 2017
2017-12-10
@Naoki Takezoe
Implemented rebase strategy
Naoki Takezoe committed on 10 Dec 2017
@Naoki Takezoe
Format code
Naoki Takezoe committed on 10 Dec 2017
2017-07-12
@Naoki Takezoe
Remove unnecessary semicolon
Naoki Takezoe committed on 12 Jul 2017
2017-03-10
@Naoki Takezoe
Introduce syntax suger to tuple extraction
Naoki Takezoe committed on 10 Mar 2017
2017-01-13
@xuwei-k
remove unused imports
xuwei-k committed on 13 Jan 2017
2016-01-16
@Naoki Takezoe
Small fix about code style
Naoki Takezoe committed on 16 Jan 2016
2016-01-02
@nazoking
update button
nazoking committed on 2 Jan 2016
2016-01-01
@Naoki Takezoe
Fix compilation error caused by JGit update
Naoki Takezoe committed on 1 Jan 2016
2015-03-16
@Tomofumi Tanaka
Merge remote-tracking branch 'origin/master' into api-support ...
Tomofumi Tanaka committed on 16 Mar 2015