Forgot - maybe a stupid question, but can you set up a topic branch to track a
remote branch (and would that make sense)?
R
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
On Monday April 04 2016 11:56:23 Welbourne Edward wrote:
>You can even use: git log --graph
>if you can cope with ASCII art ;-)
As long as it doesn't include cows ;)
>merge-base - if you have a strict tree, this isn't a merge, so it's
>where one was branched off the other, but nothing about the
René J.V. Bertin
> I've seen graphical utilities that attempt to show the branch
> hierarchy in some kind of tree,
You can even use: git log --graph
if you can cope with ASCII art ;-)
> but apparently miss from `git help branch` if it's possible to know
> the origin branch of a topic branch. Is i
On Monday April 04 2016 10:25:16 Welbourne Edward wrote:
More very useful info, thanks!
> For three-way diffs between two commits and their most recent common
> ancestor, you can use git diff $topic...$other, if you're comfortable
> reading three-way diffs,
I could be - using a side-by-side visu
In response to:
>>> What works well for me e.g. before doing a commit is what I think of
>>> as manual rebasing: I remove my patches one way or another, git-pull,
>>> and then reapply the patch(es).
I offered:
>> That's pretty much exactly what
>>
>> $ git pull -r
>>
>> (a.k.a. --rebase) will do f
04.04.2016, 12:32, "René J. V. Bertin" :
> Welbourne Edward wrote:
>
> Hi,
>
>>> What works well for me e.g. before doing a commit is what I think of
>>> as manual rebasing: I remove my patches one way or another, git-pull,
>>> and then reapply the patch(es).
>>
>> That's pretty much exactly
Welbourne Edward wrote:
Hi,
>> What works well for me e.g. before doing a commit is what I think of
>> as manual rebasing: I remove my patches one way or another, git-pull,
>> and then reapply the patch(es).
>
> That's pretty much exactly what
>
> $ git pull -r
>
> (a.k.a. --rebase) will do f
