| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make test script t9157 executable | Junio C Hamano | 2010-10-06 | 1 | -0/+0 |
| | | | | | | | Fixes a buglet introduced by a3c75056d Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||||
| * | git-svn: check_cherry_pick should exclude commits already in our history | Steven Walter | 2010-09-24 | 1 | -0/+50 |
| The merge-base between @$parents and $merge_tip may have been reached through a merge commit. This means that some commits that are ancestors of @$parents will not be ancestors of $merge_base. The mergeinfo property will not list commits that are ancestors of @$parents, so we need to explicitly exclude them. [ew: squashed and cleaned up test case from Steven] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |