pimhwang/qTox - qTox - git.quantfans.net

4662 Commits

3 Branches

42 Tags

54 MiB

Tree: 2a89a4ec0f

Commit Graph

Author	SHA1	Message	Date
Zetok Zalbavar	b9abea636e	chore(merge-script): add check for number and a useful failure message Message appears only if merge was unsuccessful and makes deleting as quick as copypasting. Check makes sure that supplied argument is actually an number, which helps avoid waiting for git to eror out on "no remote branch". Additionally, renamed `original` upstream to `upstream`, according to @sudden6's suggestion.	10 years ago
Zetok Zalbavar	65608596d5	chore(merge-script): add a way to add optional merge message This allows to close related to PR issues when PR submitter forgets to include that in commit message, or add some other additional info. E.g. `./merge-pr.sh 3033 'Fu fu fu. :3'` would result in: ``` Merge pull request #3033 Fu fu fu. :3 sudden6 (1): update friend activity on groupchat events fixes #2848 ```	10 years ago
Zetok Zalbavar	7c30bf6836	chore: add script for creating signed merge commits Merge messages are composed of PR number + appended shortlog. Script is supposed to work only if there are no merge conflicts. Example usage: `./merge-pr.sh 1234`	10 years ago

Author

SHA1

Message

Date

Zetok Zalbavar

b9abea636e

chore(merge-script): add check for number and a useful failure message

Message appears only if merge was unsuccessful and makes deleting
as quick as copypasting.

Check makes sure that supplied argument is actually an number, which
helps avoid waiting for git to eror out on "no remote branch".

Additionally, renamed `original` upstream to `upstream`, according to
@sudden6's suggestion.

10 years ago

Zetok Zalbavar

65608596d5

chore(merge-script): add a way to add optional merge message

This allows to close related to PR issues when PR submitter forgets to
include that in commit message, or add some other additional info.

E.g. `./merge-pr.sh 3033 'Fu fu fu. :3'` would result in:
```
    Merge pull request #3033

    Fu fu fu. :3

    sudden6 (1):
          update friend activity on groupchat events     fixes #2848
```

10 years ago

Zetok Zalbavar

7c30bf6836

chore: add script for creating signed merge commits

Merge messages are composed of PR number + appended shortlog.
Script is supposed to work only if there are no merge conflicts.

Example usage: `./merge-pr.sh 1234`

10 years ago

3 Commits (2a89a4ec0fe7402c9ba6c6d48d50346e60e27e7b)