When you cherry-pick, it creates a new commit with a new SHA. If you do: 

    git cherry-pick -x &lt;sha&gt;

then at least you&#39;ll get the commit message from the original commit appended to your new commit, along with the original SHA, which is very useful for tracking cherry-picks.

If you&#39;re an **IntelliJ** user, it&#39;s pretty simple.
Here, I am **cherry-picking** a commit from `master` branch to `give-me-commit-branch`. Note a few points in the below pic:

- **destination**: The current checkout branch is `give-me-a-commit-branch`. Denoted by *tag* icon.
- **source**: The selected `master` branch whose commit logs are displayed on the right side is the source of the commit.
- **searching ability**: Using the search (lens icon) option, we can find the revision number.
- **multiple-selections**: At a time, we can select multiple commits and cherry-pick them at one go!

This is easy-to-use and transparent. 

[![enter image description here][3]][3]


  [1]: https://stackoverflow.com/a/68554053/1465553
  [3]: https://i.stack.imgur.com/eoW3K.png

I&#39;ve read that Mysql server creates a log file where it keeps a record of all activities - like when and what queries execute.  

Can anybody tell me where it exists in my system? How can I read it?

Basically, I need to back up the database with different input [backup between two dates] so I think I need to use log file here, that&#39;s why I want to do it...

I think this log must be secured somehow because sensitive information such as usernames and password may be logged [if any query require this]; so may it be secured, not easily able to be seen?

I have root access to the system, how can I see the log? 

When I try to open /var/log/mysql.log it is empty.


This is my config file:

    [client]
    port        = 3306
    socket      = /var/run/mysqld/mysqld.sock

    [mysqld_safe]
    socket      = /var/run/mysqld/mysqld.sock
    nice        = 0

    [mysqld]
    log = /var/log/mysql/mysql.log 
    binlog-do-db=zero



    user        = mysql
    socket      = /var/run/mysqld/mysqld.sock
    port        = 3306
    basedir     = /usr
    datadir     = /var/lib/mysql
    tmpdir      = /tmp
    skip-external-locking

    bind-address        = 127.0.0.1
    #
    # * Fine Tuning
    #
    key_buffer      = 16M
    max_allowed_packet  = 16M
    thread_stack        = 192K
    thread_cache_size       = 8

    general_log_file        = /var/log/mysql/mysql.log
    general_log             = 1


How to see log files in MySQL?

I installed JDK using apt-get install but I don&#39;t know where my jdk folder is. I need to set the path for that. Does any one have a clue on the location?

Where can I find the Java SDK in Linux after installing it?

I have 2 branches, `master` and `dev`.

I am on `dev` branch and I want to cherry-pick 1 commit from `master` to `dev`. So I did 

    $ git cherry-pick be530cec7748e037c665bd5a585e6d9ce11bc8ad
    Finished one cherry-pick.

But when I do `git status` and `gitx`, I don&#39;t see my commit `be530cec7748e037c665bd5a585e6d9ce11bc8ad` in git history.

How can I see my commit in the `dev` branch?

How to cherry pick from 1 branch to another

I have 2 branches, <code>master</code> and <code>dev</code>.
I am on <code>dev</code> branch and I want to cherry-pick 1 commit from <code>master</code> to <code>dev</code>. So I did
<pre><code class="hljs language-ruby">$ git cherry-pick be530cec7748e037c665bd5a585e6d9ce11bc8ad
Finished one cherry-pick.
</code></pre>
But when I do <code>git status</code> and <code>gitx</code>, I don't see my commit <code>be530cec7748e037c665bd5a585e6d9ce11bc8ad</code> in git history.
How can I see my commit in the <code>dev</code> branch?

I&#39;m running a very rapid code-compile-test loop where I am amending changes to my commits far more often than not.

For example:

    # Make some changes
    $ git commit -m &quot;Added feature X&quot;
    # Compile, test
    # Fix bugs
    $ git commit -a --amend

I usually want the same commit message after I fix my bugs. Is there a way to make git skip firing up my `EDITOR` and just use the original commit message?

How to skip the commit message step in &quot;git commit --amend&quot;?

I have a remote Git server, here is the scenario which I want to perform:

* For each bug/feature I create a different Git branch

* I keep on committing my code in that Git branch with un-official Git messages

* In top repository we have to do one commit for one bug with official Git message

So how can I merge my branch to remote branch so that they get just one commit for all my check-ins (I even want to provide commit message for this)?

How can I merge multiple commits onto another branch as a single squashed commit?

How do I remove commits which have no changeset using git filter-branch?

I rewrote my git history using:

&lt;!-- language: lang-bash --&gt;

    git filter-branch --tree-filter &#39;rm -r -f my_folder&#39; -f HEAD

this worked out well but now I have lots of commits with empty changesets. I would like to remove those commits. Preferably in msysgit.

Rebasing is not really an option because I have over 4000 commits and half of them must be removed.

Git - remove commits with empty changeset using filter-branch

Open Source project [Trac][1] has an excellent diff highlighter &amp;mdash; it highlights changed lines **and changed bytes in each changed line!** See [here][2] or [here][3] for examples.

Is there way to use the same color highlight (i.e. changed lines **and changed bytes too**) in bash terminal, `git`, or `vim` **for diff output (patch-file)?**


  [1]: http://trac.edgewall.org/
  [2]: https://trac.transmissionbt.com/changeset/12148
  [3]: http://trac.gajim.org/changeset/297ad7711d20bfee1491768640d9bc5384464363

Highlight changed lines and changed bytes in each changed line

Suppose we have an application that&#39;s stable. 

Tomorrow, someone reports a big ol&#39; bug that we decide to hotfix right away. So we create a branch for that hotfix off of &quot;master&quot;, we name it &quot;2011_Hotfix&quot;, and we push it up so that all of the developers can collaborate on fixing it.

We fix the bug, and merge &quot;2011_Hotfix&quot; into &quot;master&quot; as well as into the current development branch. And push &quot;master.&quot;

What do we do with &quot;2011_Hotfix&quot; now? Should it just sit out there as a branch forever until the end of time or should we now delete it, since it has served its purpose? It seems unclean to just leave branches lying around everywhere, as the list of branches will likely become very long, most of which aren&#39;t even necessary anymore.

In the event that it should be deleted, what will happen to its history? Will that be maintained, even though the actual branch is no longer available? Also, how would I remove a remote branch?

When to delete branches in Git?

If I want to merge into a Git branch the changes made only to some of the files changed in a particular commit which includes changes to multiple files, how can this be achieved?

Suppose the Git commit called `stuff` has changes to files `A`, `B`, `C`, and `D` but I want to merge only `stuff`&#39;s changes to files `A` and `B`. It sounds like a job for `git cherry-pick` but `cherry-pick` only knows how to merge entire commits, not a subset of the files.

How to git-cherry-pick only changes to certain files?

I&#39;m trying to cherry-pick a commit from master and get it into the current production branch.  However, when I execute `git cherry-pick &lt;SHA-hash&gt;`, I just get this message:


    # On branch prod_20110801
    # Untracked files:
    #   (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)
    #	site/test-result/
     nothing added to commit but untracked files present (use &quot;git add&quot; to track)
     The previous cherry-pick is now empty, possibly due to conflict resolution.
    If you wish to commit it anyway, use:
    
        git commit --allow-empty
    
    Otherwise, please use &#39;git reset&#39;

Note: I&#39;ve tried doing a reset and a reset --hard HEAD^, and neither seemed to change anything.

I&#39;m confused as to why this isn&#39;t working for me.

Any insight, advice, or ideas on how to resolve this would be helpful~!

git cherry-pick not working

I made some changes in my master branch and want to bring those upstream. When I cherry-pick the following commits. However, I get stuck on fd9f578 where git says:

    $ git cherry-pick fd9f578
    fatal: Commit fd9f57850f6b94b7906e5bbe51a0d75bf638c74d is a merge but no -m option was given.

What is git trying to tell me and is cherry-pick the right thing to be using here?  The master branch does include changes to files which have been modified in the upstream branch, so I&#39;m sure there will be some merge conflicts but those aren&#39;t too bad to straighten out. I know which changes are needed where.

These are the commits I want to bring upstream.

    e7d4cff added some comments...
    23e6d2a moved static strings...
    44cc65a incorporated test ...
    40b83d5 whoops delete whitspace...
    24f8a50 implemented global.c...
    43651c3 cleaned up ...
    068b2fe cleaned up version.c ...
    fd9f578 Merge branch &#39;master&#39; of ssh://extgit/git/sessions_common
    4172caa cleaned up comments in sessions.c ...



git cherry-pick says &quot;...38c74d is a merge but no -m option was given&quot;

Recently, I have been asked to `cherry-pick` a commit. 

***So what does cherry-picking a commit in git mean? How do you do it?*** 



What does cherry-picking a commit with Git mean?

There&#39;ve been several questions recently about skipping changes when maintaining release branches in Mercurial. For example:

 * [Mercurial: Branch specific changes keep coming back after dummy merge][1]
 * [Why are Mercurial backouts in one branch affecting other branches?][2]

Since it was introduced in 2.0, I&#39;ve wondered about using `graft` to avoid this problem. Given a revision tree like this:

    A---B---C---D---E---F---G---H---I---J

Suppose we need to create a release branch that skips the Evil change `E`.

    hg update -r D
    hg graft &quot;F::J&quot;

giving us:

    A---B---C---D---E---F---G---H---I---J
                 \
                  --F&#39;--G&#39;--H&#39;--I&#39;--J&#39;

 - Q1: What just happened here? I can understand that `transplant` would have generated patches out of `F::J`, and then applied them onto `D`, but `graft` is said to use the 3-way merge rather than patches. So....... how does that work? Why is it better?

Lets say I now fix `E`, and merge that into my release branch.

                      --E2-----------------
                     /                     \
    A---B---C---D---E---F---G---H---I---J---M1
                 \                            \
                  --F&#39;--G&#39;--H&#39;--I&#39;--J&#39;---------M2--

M1 is a straight merge; nothing special there.
M2 is merging branches which have &quot;the same&quot; (or at least equivalent) changes on.

 - Q2: Is this merge just a normal 3-way merge using `D`, `J&#39;` and `M1`?
 - Q3: Has mercurial stored/used extra information about the graft operation to help it with the merge?

And finally...

 - Q4: What are the potential problems with a flow like this?


 [1]: https://stackoverflow.com/questions/9532823/mercurial-branch-specific-changes-keep-coming-back-after-dummy-merge
 [2]: https://stackoverflow.com/questions/9500399/why-are-mercurial-backouts-in-one-branch-affecting-other-branches

Consequences of using graft in Mercurial

I created a new branch named `newbranch` from the `master` branch in git. Now I have done some work and want to merge `newbranch` to `master`; however, I have made some extra changes to `newbranch` and I want to merge `newbranch` up to the fourth-from-the-last commit to `master`.

I used `cherry-pick` but it shows the message to use the right options:

    git checkout master    
    git cherry-pick ^^^^HEAD newbranch

Can I use git `merge` to do it instead?

    git merge newbranch &lt;commitid&gt;

Merge up to a specific commit

Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting to pull from the server when I get the following error:

    $ git pull
    fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
    Please, commit your changes before you can merge.
    $

Git status reads:

    $ git status
    # On branch main
    # Your branch is behind &#39;origin/main&#39; by 2 commits, and can be fast-forwarded.
    #
    $

I have tried the following to no avail:

    $ git cherry-pick --continue
    usage: git cherry-pick [options] &lt;commit-ish&gt;
    $

Any idea on how I could resolve this? Thanks in advance!

How to Conclude a Git Cherry-Pick?

So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be easy, how ever I get an error about it being a merge but not -m was given?


    $ git cherry-pick a8c5ad438f6173dc34f6ec45bddcef2ab23285e0
    error: Commit a8c5ad438f6173dc34f6ec45bddcef2ab23285e0 is a merge but no -m option was given.
    fatal: cherry-pick failed

That looks wrong.......it should be:

    $ git cherry-pick a8c5ad438f6173dc34f6ec45bddcef2ab23285e0

Since when do I have to supply a -m function?


Content Type	Original Author	Original Content on Stackoverflow
Question	michael	View Question on Stackoverflow
Solution 1 - Git	CanSpice	View Answer on Stackoverflow
Solution 2 - Git	Saurav Sahu	View Answer on Stackoverflow

How to cherry pick from 1 branch to another

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Where can I find the Java SDK in Linux after installing it?

How to see log files in MySQL?

Attributions