Skip to content

WIP: Add XdgDesktopFile::actionExpandExecString - #198

Open
damianatorrpm wants to merge 2 commits into
lxqt:masterfrom
damianatorrpm:master
Open

WIP: Add XdgDesktopFile::actionExpandExecString#198
damianatorrpm wants to merge 2 commits into
lxqt:masterfrom
damianatorrpm:master

Conversation

@damianatorrpm

Copy link
Copy Markdown

Same as expandExecString but for actions.

@luis-pereira luis-pereira left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Squash the two commits into one commit
  • We are using 4 spaces tab.
  • Remove trailing whitespaces. See them with git log --check

Thanks for your contribution

@damianatorrpm

damianatorrpm commented Dec 22, 2019

Copy link
Copy Markdown
Author

I don't see this options in github GUI. I have never used git in-depth except github and do not intend to do so. I can send the patch via e-mail alternatively if you want. If there is some GUI for git that has these options to do easily I am ready to install that. The buildsystem I use has nothing to do with git though for the sake of working together with upstream I fork using github, copy paste the bits out of my patch file and create a pull request. I am extremely reluctant to git in general as I do not like it's workflow.

@agaida agaida changed the title Add XdgDesktopFile::actionExpandExecString WIP: Add XdgDesktopFile::actionExpandExecString Dec 25, 2019
@luis-pereira

Copy link
Copy Markdown
Member

@damianatorrpm
git is not build system. It's a distributed control version system. The most widely used these days. LXQt build system is CMake.
LXQt uses git. So a developer must have a minimal understanding on how to use it.
You can use gitk to do a mixed reset to the first commit, them use git gui to amend the commit. Then push as usual, but use the -f flag.

@tsujan

tsujan commented Dec 29, 2019

Copy link
Copy Markdown
Member

I also had problems with git when I started to use it several years ago. But, after a few weeks, everything became clear. IMHO, the best way of using git is command line; git front-ends/GUIs hide git.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants