On Fri, Nov 23, 2012 at 06:58:49PM -0800, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
The following patch is an attempt to implement this idea.
I think revert is a wrong word (implying you have already done
something and you are trying to defeat the effect of that old
Kacper Kornet drae...@pld-linux.org writes:
Is there any interaction between this pull --reverse-parents
change and possible conflict resolution when the command stops and
asks the user for help? For example, whom should --ours and -X
ours refer to? Us, or the upstream?
The change of
When the changes are pushed upstream, and in the meantime someone else
updated upstream branch git advises to use git pull. This results in
history:
---A---B---C--
\ /
D---E
where B is my commit. D, E are commits pushed by someone else when I was
working on B. However
Kacper Kornet drae...@pld-linux.org writes:
The following patch is an attempt to implement this idea.
I think revert is a wrong word (implying you have already done
something and you are trying to defeat the effect of that old
something), and you meant to say reverse (i.e. the opposite of
4 matches
Mail list logo
