iam-git / IvoRSS (public) (License: MIT) (since 2022-06-16) (hash sha1)
simple RSS client for Amiga flavor OSes
Clone URLs: https://rocketgit.com/user/iam-git/IvoRSS ssh://rocketgit@ssh.rocketgit.com/user/iam-git/IvoRSS git://git.rocketgit.com/user/iam-git/IvoRSS
Merge request 2 (19747a4b22ffb76cd46f312751998e8c7b9522c8 -> e16c8c6f3576a1e98f292a18a6e5140230129536)
By: anonymous
Against ref: refs/heads/main
Date: 2022-07-27 21:49
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
textfield: fix html characters substituting. I forgot IIf calculates both expressions :) e16c8c6f3576a1e98f292a18a6e5140230129536 Alex 2022-07-27 21:47:42
Commit e16c8c6f3576a1e98f292a18a6e5140230129536 - textfield: fix html characters substituting. I forgot IIf calculates both expressions :)
Author: Alex
Author date (UTC): 2022-07-27 21:47
Committer name: Alex
Committer date (UTC): 2022-07-27 21:47
Parent(s): 19747a4b22ffb76cd46f312751998e8c7b9522c8
Signer:
Signing key:
Signing status: N
Tree: 194f1592a4406a43269db35cff5ffc0f97a69256
File Lines added Lines deleted
textfield.hws 5 1
File textfield.hws changed (mode: 100755) (index 5b70109..6a7d367)
... ... EndFunction
51 51
52 52 Function htmlChr(str$) Function htmlChr(str$)
53 53 Local code = RawGet(html_table, str$) Local code = RawGet(html_table, str$)
54 Return(IIf(IsNil(code), "&"..str$, Chr(code)))
54 If IsNil(code)
55 Return("&"..str$)
56 Else
57 Return(Chr(code))
58 EndIf
55 59 EndFunction EndFunction
56 60
57 61
Hints:
How to merge on your machine?
git fetch origin refs/mr/2:mr-2
git checkout main
git merge mr-2

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/2