Re: check if a commit is ascendent of a specific commit

2 messages, 2 authors, 2016-08-11 · open the first message on its own page

Re: check if a commit is ascendent of a specific commit

From: Junio C Hamano <hidden>
Date: 2016-08-11 20:47:02

"Nguyen Thai Ngoc Duy" [off-list ref] writes:
Hi,
I want to create "git-amend-commit" to be able to amend commits before
HEAD. So I need to check whether the commit I'm going to amend is
ascendent of HEAD. Is there any way to check that?
Ascendant is a word from astorology -- you mean ancestor ;-).

"git-merge-base A B === A" when A is an ancestor of B.

Provided if the history between A and B is linear, and you do
not have trouble making your co-workers adjusting to your
history change after A (including the cases where you do not
have any co-workers or you have not made history between A and B
public), you could do one of these three things:

 - use "stg uncommit" until you pop A, make a change there and
   "stg refresh", and then "stg push" everything back.

 - "git format-patch A && git reset --hard A", edit the patches
   and then "git am" them.

 - "git tag -f Anchor && git reset --hard A", edit and "git
   commit --amend".  Look at "git show-branch Anchor HEAD", and
   repeatedly "git cherry-pick Anchor~$n" from older to newer
   from Anchor, and then "git tag -d Anchor".




Re: check if a commit is ascendent of a specific commit

From: Tom Prince <hidden>
Date: 2016-08-11 20:28:41

On Sat, Nov 11, 2006 at 10:43:47AM -0800, Junio C Hamano wrote:
"Nguyen Thai Ngoc Duy" [off-list ref] writes:
quoted
Hi,
I want to create "git-amend-commit" to be able to amend commits before
HEAD. So I need to check whether the commit I'm going to amend is
ascendent of HEAD. Is there any way to check that?
Ascendant is a word from astorology -- you mean ancestor ;-).

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help