summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-28 23:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-28 23:00:27 (GMT)
commit8712b3cdb0495f5a56b91cd67e2697412447a886 (patch)
tree98dafb9b4f38617d73ef59c9085e01ee727af729 /t/t3411-rebase-preserve-around-merges.sh
parentcd956c73a2cce6613a6cd19df6ccb9ff1b08f79a (diff)
parent73ff1a131b340633b2ec2a0e68490de721448f56 (diff)
downloadgit-8712b3cdb0495f5a56b91cd67e2697412447a886.zip
git-8712b3cdb0495f5a56b91cd67e2697412447a886.tar.gz
git-8712b3cdb0495f5a56b91cd67e2697412447a886.tar.bz2
Merge branch 'tr/previous-branch'
* tr/previous-branch: t1505: remove debugging cruft Simplify parsing branch switching events in reflog Introduce for_each_recent_reflog_ent(). interpret_nth_last_branch(): plug small memleak Fix reflog parsing for a malformed branch switching entry Fix parsing of @{-1}@{1} interpret_nth_last_branch(): avoid traversing the reflog twice checkout: implement "-" abbreviation, add docs and tests sha1_name: support @{-N} syntax in get_sha1() sha1_name: tweak @{-N} lookup checkout: implement "@{-N}" shortcut name for N-th last branch Conflicts: sha1_name.c
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
0 files changed, 0 insertions, 0 deletions