git.proxmox.com Git - libgit2.git/history

]> git.proxmox.com Git - libgit2.git/history - tests/rebase/merge.c

[libgit2.git] / tests / rebase / merge.c

2022-05-05	Mohammed Bilal	New upstream version 1.4.3+dfsg.1	blob \| commitdiff \| raw
2020-12-06	Utkarsh Gupta	New upstream version 1.1.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2019-05-11	Jongmin Kim	New upstream version 0.28.1+dfsg.1	blob \| commitdiff \| raw \| diff to current
2017-04-24	Russell Sim	Imported Upstream version 0.25.1	blob \| commitdiff \| raw \| diff to current
2017-03-31	Edward Thomson	Merge remote-tracking branch 'origin/pr/3790' into...	blob \| commitdiff \| raw \| diff to current
2017-03-23	Edward Thomson	Merge branch 'pr/3957'	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge branch 'pr/3912'	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge pull request #3892 from mitesch/shared_buffer	blob \| commitdiff \| raw \| diff to current
2017-01-21	Edward Thomson	Merge branch 'master' into pr/3938	blob \| commitdiff \| raw \| diff to current
2016-12-31	Edward Thomson	Merge pull request #4015 from staticfloat/sf/win_http_p...	blob \| commitdiff \| raw \| diff to current
2016-12-20	Carlos Martín Nieto	Merge pull request #3980 from tiennou/doc-fixes	blob \| commitdiff \| raw \| diff to current
2016-12-20	Edward Thomson	Merge pull request #4034 from libgit2/cmn/sysdir-no...	blob \| commitdiff \| raw \| diff to current
2016-12-20	Edward Thomson	Merge pull request #4032 from libgit2/cmn/https-cap...	blob \| commitdiff \| raw \| diff to current
2016-12-19	Carlos Martín Nieto	Merge pull request #4026 from libgit2/cmn/refdb-fs...	blob \| commitdiff \| raw \| diff to current
2016-12-19	Carlos Martín Nieto	Merge pull request #4027 from pks-t/pks/pack-deref...	blob \| commitdiff \| raw \| diff to current
2016-12-17	Carlos Martín Nieto	Merge pull request #4031 from libgit2/cmn/plug-test...	blob \| commitdiff \| raw \| diff to current
2016-12-17	Carlos Martín Nieto	rebase: plug a leak in the tests	blob \| commitdiff \| raw \| diff to current
2016-12-07	Edward Thomson	Merge pull request #4020 from novalis/rebase-detached	blob \| commitdiff \| raw \| diff to current
2016-12-02	David Turner	git_rebase_init: correctly handle detached HEAD	blob \| commitdiff \| raw \| diff to current
2016-06-26	Edward Thomson	Merge pull request #3223 from ethomson/apply	blob \| commitdiff \| raw \| diff to current
2016-06-02	Edward Thomson	Merge pull request #3808 from ethomson/read_index_fixes	blob \| commitdiff \| raw \| diff to current
2016-06-02	Edward Thomson	rebase: test rebasing a new commit with subfolder	blob \| commitdiff \| raw \| diff to current
2016-05-09	Edward Thomson	Merge pull request #3767 from pks-t/pks/misc-fixes	blob \| commitdiff \| raw \| diff to current
2016-05-06	Carlos Martín Nieto	Merge pull request #3757 from johnhaley81/jh/fix-create...	blob \| commitdiff \| raw \| diff to current
2016-05-04	Carlos Martín Nieto	Merge pull request #3769 from libgit2/ethomson/rebase_i...	blob \| commitdiff \| raw \| diff to current
2016-05-03	Edward Thomson	rebase: test rebase (merge) w/ no common ancestor	blob \| commitdiff \| raw \| diff to current
2016-04-26	Carlos Martín Nieto	Merge pull request #3749 from arthurschreiber/arthur...	blob \| commitdiff \| raw \| diff to current
2016-04-26	Carlos Martín Nieto	Merge pull request #3748 from libgit2/ethomson/rebase_d...	blob \| commitdiff \| raw \| diff to current
2016-04-21	Edward Thomson	rebase: correctly finish rebasing detached heads	blob \| commitdiff \| raw \| diff to current
2016-04-03	Andreas Henriksson	Imported Upstream version 0.24.0	blob \| commitdiff \| raw \| diff to current
2016-03-31	Carlos Martín Nieto	Merge pull request #3575 from pmq20/master-13jan16	blob \| commitdiff \| raw \| diff to current
2016-03-24	Carlos Martín Nieto	Merge pull request #3574 from chescock/buffer-sideband...	blob \| commitdiff \| raw \| diff to current
2016-03-22	Carlos Martín Nieto	Merge pull request #3559 from yongthecoder/master	blob \| commitdiff \| raw \| diff to current
2016-03-22	Carlos Martín Nieto	Merge pull request #3701 from jfultz/fix-0.24.0-changelog	blob \| commitdiff \| raw \| diff to current
2016-03-18	Edward Thomson	Merge pull request #3660 from mstrap/mingw	blob \| commitdiff \| raw \| diff to current
2016-03-17	Edward Thomson	Merge pull request #3687 from mstrap/CMAKE_C_FLAGS_DEBUG	blob \| commitdiff \| raw \| diff to current
2016-03-14	Edward Thomson	Merge pull request #3671 from libgit2/cmn/remove-mingw32	blob \| commitdiff \| raw \| diff to current
2016-03-11	Carlos Martín Nieto	Merge pull request #3636 from nerdishbynature/fix-non...	blob \| commitdiff \| raw \| diff to current
2016-03-09	Carlos Martín Nieto	Merge pull request #3623 from ethomson/rebase_with_commit	blob \| commitdiff \| raw \| diff to current
2016-03-08	Edward Thomson	Merge pull request #3555 from cbargren/ssh-git-protocols	blob \| commitdiff \| raw \| diff to current
2016-02-29	Edward Thomson	Merge pull request #3567 from sba1/few-p_getaddrinfo...	blob \| commitdiff \| raw \| diff to current
2016-02-29	Edward Thomson	rebase: additional tests for completing a rebase	blob \| commitdiff \| raw \| diff to current
2016-02-28	Carlos Martín Nieto	Merge pull request #3644 from ethomson/debug_pool	blob \| commitdiff \| raw \| diff to current
2016-02-28	Edward Thomson	Merge pull request #3577 from rossdylan/rossdylan/pooldebug	blob \| commitdiff \| raw \| diff to current
2016-02-19	Carlos Martín Nieto	Merge pull request #3597 from ethomson/filter_registration	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3604 from ethomson/nsec_xplat	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3606 from ethomson/drop_xp	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3613 from ethomson/fixups	blob \| commitdiff \| raw \| diff to current
2016-02-18	Carlos Martín Nieto	Merge pull request #3619 from ethomson/win32_forbidden	blob \| commitdiff \| raw \| diff to current
2016-02-11	Carlos Martín Nieto	Merge pull request #3610 from ethomson/rebase_bare	blob \| commitdiff \| raw \| diff to current
2016-02-11	Edward Thomson	rebase: allow custom merge_options	blob \| commitdiff \| raw \| diff to current
2015-05-09	Carlos Martín Nieto	Merge pull request #3104 from whoisj/optimal-buffer...	blob \| commitdiff \| raw \| diff to current
2015-05-06	Carlos Martín Nieto	Merge pull request #3086 from yongthecoder/master	blob \| commitdiff \| raw \| diff to current
2015-05-04	Carlos Martín Nieto	Merge pull request #3087 from ethomson/pr/3054	blob \| commitdiff \| raw \| diff to current
2015-05-02	Edward Thomson	Merge pull request #3089 from volftomas/patch-2	blob \| commitdiff \| raw \| diff to current
2015-05-01	Edward Thomson	Merge pull request #3059 from libgit2/cmn/negotiation...	blob \| commitdiff \| raw \| diff to current
2015-05-01	Edward Thomson	Merge pull request #3081 from leoyanggit/build_warnings	blob \| commitdiff \| raw \| diff to current
2015-04-30	Carlos Martín Nieto	Merge pull request #3090 from libgit2/jamill/doc_update	blob \| commitdiff \| raw \| diff to current
2015-04-30	Carlos Martín Nieto	Merge pull request #3088 from volftomas/patch-1	blob \| commitdiff \| raw \| diff to current
2015-04-30	Tomas Paladin Volf	Fixed unused warning in tests/rebase/merge.c	blob \| commitdiff \| raw \| diff to current
2015-04-24	Edward Thomson	Merge pull request #3071 from linquize/git_reflog_drop	blob \| commitdiff \| raw \| diff to current
2015-04-23	Carlos Martín Nieto	Merge branch 'attr-ignore'	blob \| commitdiff \| raw \| diff to current
2015-04-23	Edward Thomson	Merge pull request #3032 from jfultz/index-file-modes	blob \| commitdiff \| raw \| diff to current
2015-04-21	Edward Thomson	Merge pull request #3051 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-04-21	Carlos Martín Nieto	Merge pull request #2992 from ethomson/rebase_fixes	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: include checkout opts within rebase opts	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: test checkout options for rebase	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: init and open take a rebase_options	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: take `checkout_options` where appropriate	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: block rebase_commit with unstaged changes	blob \| commitdiff \| raw \| diff to current
2015-04-20	Edward Thomson	rebase: commit should return GIT_EUNMERGED	blob \| commitdiff \| raw \| diff to current
2015-03-24	Carlos Martín Nieto	Merge pull request #3010 from ethomson/checkout_invalid...	blob \| commitdiff \| raw \| diff to current
2015-03-18	Carlos Martín Nieto	Merge remote-tracking branch 'ethomson/submodule_8dot3'	blob \| commitdiff \| raw \| diff to current
2015-03-11	Carlos Martín Nieto	Merge commit 'refs/pull/2879/head' of ssh://github...	blob \| commitdiff \| raw \| diff to current
2015-03-04	Carlos Martín Nieto	Merge pull request #2932 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-03-04	Carlos Martín Nieto	Merge pull request #2886 from jeffhostetler/jeffhostetl...	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2934 from akikoskinen/mingw_build_fix	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2913 from ethomson/stash_fixup	blob \| commitdiff \| raw \| diff to current
2015-03-03	Edward Thomson	Merge pull request #2808 from libgit2/cmn/repo-ident	blob \| commitdiff \| raw \| diff to current
2015-03-03	Carlos Martín Nieto	Remove the signature from ref-modifying functions	blob \| commitdiff \| raw \| diff to current
2014-12-22	Edward Thomson	Merge pull request #2745 from libgit2/cmn/pkg-config-ssh	blob \| commitdiff \| raw \| diff to current
2014-12-10	Edward Thomson	Merge pull request #2678 from libgit2/cmn/io-stream	blob \| commitdiff \| raw \| diff to current
2014-12-09	Edward Thomson	Merge pull request #2750 from linquize/generate.py	blob \| commitdiff \| raw \| diff to current
2014-12-08	Edward Thomson	Merge pull request #2751 from linquize/broken-test-win	blob \| commitdiff \| raw \| diff to current
2014-12-07	Linquize	Fix broken merge tests due to autocrlf was not false	blob \| commitdiff \| raw \| diff to current
2014-12-07	Edward Thomson	Merge pull request #2746 from libgit2/cmn/neg-ignore-dir	blob \| commitdiff \| raw \| diff to current
2014-12-06	Edward Thomson	Merge pull request #2748 from libgit2/cmn/doc-all	blob \| commitdiff \| raw \| diff to current
2014-12-06	Edward Thomson	Merge pull request #2730 from libgit2/cmn/local-push	blob \| commitdiff \| raw \| diff to current
2014-12-06	Edward Thomson	Merge pull request #2747 from libgit2/cmn/notes-consistency	blob \| commitdiff \| raw \| diff to current
2014-12-06	Carlos Martín Nieto	notes: move the notes name argument	blob \| commitdiff \| raw \| diff to current
2014-11-18	Edward Thomson	Merge pull request #2654 from linquize/missing-obj	blob \| commitdiff \| raw \| diff to current
2014-11-09	Carlos Martín Nieto	Merge pull request #2653 from ethomson/contributing	blob \| commitdiff \| raw \| diff to current
2014-10-27	Carlos Martín Nieto	Merge commit 'refs/pull/2366/head' of github.com:libgit...	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	Merge pull request #2482 from libgit2/ed/rebase	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	s/git_merge_head/git_annotated_commit	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	rebase: preload all operations	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	rebase: init/open a git_rebase object	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	git_rebase_next: provide info about the operation	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	git_rebase_finish: rewrite notes when finishing rebase	blob \| commitdiff \| raw \| diff to current
2014-10-27	Edward Thomson	git_rebase_commit: write HEAD's reflog appropriately	blob \| commitdiff \| raw \| diff to current
next

The git library used in some Proxmox tool chains

RSS Atom