Stack Overflow
Stack Overflow

Questions tagged [git-cherry]

Git command that lists revisions not merged to upstream (not-pushed commits).

22 questions
1
vote
0 answers

git cherry master upstream vs upstream master

I am a bit confused as to what the logical difference here is between git cherry master upstream and git cherry upstream master. I get that it former is probably the more correct one to apply, but I don't exactly get why the list is much longer the…
Muhwu
  • 1,151
  • 1
  • 10
  • 26
1
vote
1 answer

Git - How to filter commits while using "git cherry"

I wonder if there is a way to filter only commits to be applied when we use, git cherry dev On other words, lets assume above command produces output below, - 33d5713b613f56938f23f8f61c55e63c34a92720 + fe77980a11d85ee3a14d45274b0b6db4af8b6574 -…
Sazzad Hissain Khan
  • 37,929
  • 33
  • 189
  • 256
0
votes
1 answer

Git: Cherry-pick adding code that not in the commit

I am using cherry pick to add commits from my branches on github. I have a branch with only one commit and that is related to creating a new function. when, I try to add that commit using cherry-pick, I got a conflict with 3 incoming funcitons! git…
Hat hout
  • 471
  • 1
  • 9
  • 18
0
votes
1 answer

How to copy (not move) one git branch with merges to another

I am trying to reorganize GIT repository, which is full of unorganized branches. Now we want to make some structure there (devel, production, features, ...branches) and delete/squash many small changes too. But something is needed to keep yet as it…
gilhad
  • 609
  • 1
  • 5
  • 22
0
votes
1 answer

git cherry shows a new commit as cherry-picked when an identical commit was cherry-picked in the past

Assume that there are two branches branch1 and branch2 and there is a test.txt on both the branches with the following line "opt:true". Change the value from "true" to "false" on both the branches. On branch1, change the value from "false" to "true"…
Kiran
  • 9
  • 2
0
votes
2 answers

See commits between branches (git cherry) with descriptions?

The git cherry command is great for seeing what commits have happened between two branches. However, by default it just gives you a list of commit IDs - not that informative. $ git cherry master dev # Commits in "dev" since it forked from "master" +…
Robin Winslow
  • 10,908
  • 8
  • 62
  • 91
-1
votes
1 answer

GIT Cherry–Picking Commits Out Of Order

I have 1 file I modify code on one part of the file and do commit A I modify code on another part of the file and do commit B If I cherry–pick Commit B from source to release first, and then Commit A at a later late, will the changes from Commit B…
K. Ventura
  • 91
  • 2
  • 14
1
2