On Mon, Feb 15, 2010 at 12:17:17AM -0600, Jonathan Nieder wrote:
retitle 493646 git cvsimport -m: too eager to declare a merge
reassign 493646 git-cvs
thanks
Kurt Roeckx wrote:
I think they're mostly created using git cvsimport, which seems
to be doing something else and makes it show
Kurt Roeckx wrote:
On Sat, Feb 13, 2010 at 03:02:46PM -0600, Jonathan Nieder wrote:
Then while on the stable branch you use 'git cherry-pick H'. This
produces a history like so:
E -- F -- G --- H --- I --- ... [devel]
/
A -- B -- C -- D --- H' [stable]
where H' introduces the
On Sun, Feb 14, 2010 at 03:16:50AM -0600, Jonathan Nieder wrote:
I don't understand.
Part of my confusion is that what you are talking about is creating
history, but gitk is mostly a tool for viewing history. So I am
trying to imagine what series of commands created the history you are
retitle 493646 git cvsimport -m: too eager to declare a merge
reassign 493646 git-cvs
thanks
Kurt Roeckx wrote:
I think they're mostly created using git cvsimport, which seems
to be doing something else and makes it show up as a merge.
Okay, so the problem is that merges in the CVS world and
On Fri, Feb 12, 2010 at 05:26:40PM -0600, Jonathan Nieder wrote:
Kurt Roeckx wrote:
I think the main problem is that when I look at the history in git
that it's unclear which patches are all applied to a branch.
If you have a branch and you add a few patches to it, and then
merge only
Kurt Roeckx wrote:
On Fri, Feb 12, 2010 at 05:26:40PM -0600, Jonathan Nieder wrote:
Suppose (where time flows left to right), I have this history:
E -- F -- G [topic]
/
A -- B -- C -- D [master]
If I am on branch master and use 'git merge topic', then all the
changes from A to G
On Sat, Feb 13, 2010 at 03:02:46PM -0600, Jonathan Nieder wrote:
Then while on the stable branch you use 'git cherry-pick H'. This
produces a history like so:
E -- F -- G --- H --- I --- ... [devel]
/
A -- B -- C -- D --- H' [stable]
where H' introduces the same change as H
severity 493646 wishlist
thanks
Hi Kurt,
About a year ago, you wrote:
Package: gitk
Version: 1:1.5.6.3-1
When looking at the history with gitk, when there is a merge, it's not
clear at all to me what exactly got merged.
It's ussually only the last commit on the developement branch
On Fri, Feb 12, 2010 at 04:49:34PM -0600, Jonathan Nieder wrote:
Hi Kurt,
About a year ago, you wrote:
Package: gitk
Version: 1:1.5.6.3-1
When looking at the history with gitk, when there is a merge, it's not
clear at all to me what exactly got merged.
It's ussually only
Kurt Roeckx wrote:
On Fri, Feb 12, 2010 at 04:49:34PM -0600, Jonathan Nieder wrote:
Could you say a little more about this? Is the problem that you want
a list of patches representing the diff between a merge commit and its
first parent?
I think the main problem is that when I look at the
Package: gitk
Version: 1:1.5.6.3-1
When looking at the history with gitk, when there is a merge, it's not
clear at all to me what exactly got merged.
It's ussually only the last commit on the developement branch
that is merged to a stable branch. But it could also be more than 1
commit.
The
11 matches
Mail list logo
