mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-27 22:24:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
Peter Cottle 2021-02-21 10:29:43 -07:00
commit 2d4ddee60f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/git/index.js
View file

@ -1617,7 +1617,7 @@ GitEngine.prototype.resolveName = function(someRef) {
return 'commit ' + obj.get('id');
}
if (obj.get('type') == 'branch') {
return 'branch "' + obj.get('id') + '"';
return 'branch "' + obj.get('id').replace(/\bmaster\b/, 'main') + '"';
}
// we are dealing with HEAD
return this.resolveName(obj.get('target'));