delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	cache-tree: wrap the_index based wrappers with #ifdef	Nguyễn Thái Ngọc Duy	2018-08-13	1	-2/+2
*	Merge branch 'bc/sequencer-export-work-tree-as-well'	Junio C Hamano	2018-08-02	1	-0/+2
\|\
\| *	sequencer: pass absolute GIT_WORK_TREE to exec commands	brian m. carlson	2018-07-16	1	-0/+2
* \|	Merge branch 'js/rebase-merge-octopus'	Junio C Hamano	2018-08-02	1	-43/+125
\|\ \
\| * \|	rebase --rebase-merges: add support for octopus merges	Johannes Schindelin	2018-07-11	1	-43/+125
* \| \|	Merge branch 'sb/object-store-lookup'	Junio C Hamano	2018-08-02	1	-7/+7
\|\ \ \
\| * \| \|	commit: add repository argument to lookup_commit	Stefan Beller	2018-06-29	1	-2/+2
\| * \| \|	commit: add repository argument to lookup_commit_reference	Stefan Beller	2018-06-29	1	-3/+3
\| * \| \|	commit: add repository argument to lookup_commit_reference_gently	Stefan Beller	2018-06-29	1	-1/+1
\| * \| \|	tree: add repository argument to lookup_tree	Stefan Beller	2018-06-29	1	-1/+1
\| * \| \|	Merge branch 'sb/object-store-grafts' into sb/object-store-lookup	Junio C Hamano	2018-06-29	1	-25/+27
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'as/sequencer-customizable-comment-char'	Junio C Hamano	2018-07-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	sequencer: use configured comment character	Aaron Schrab	2018-07-16	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch 'jk/empty-pick-fix'	Junio C Hamano	2018-07-24	1	-4/+8
\|\ \ \ \
\| * \| \| \|	sequencer: don't say BUG on bogus input	Jeff King	2018-07-11	1	-2/+4
\| * \| \| \|	sequencer: handle empty-set cases consistently	Jeff King	2018-07-11	1	-2/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'bb/pedantic'	Junio C Hamano	2018-07-24	1	-2/+2
\|\ \ \ \
\| * \| \| \|	sequencer.c: avoid empty statements at top level	Beat Bolli	2018-07-09	1	-2/+2
* \| \| \| \|	Merge branch 'en/rebase-i-microfixes'	Junio C Hamano	2018-07-18	1	-1/+6
\|\ \ \ \ \
\| * \| \| \| \|	Fix use of strategy options with interactive rebases	Elijah Newren	2018-06-27	1	-1/+6
* \| \| \| \| \|	Merge branch 'pw/rebase-i-keep-reword-after-conflict'	Junio C Hamano	2018-07-18	1	-3/+20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	sequencer: do not squash 'reword' commits when we hit conflicts	Phillip Wood	2018-06-19	1	-3/+20
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sb/object-store-grafts'	Junio C Hamano	2018-07-18	1	-25/+27
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| / \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	path.c: migrate global git_path_* to take a repository argument	Stefan Beller	2018-05-18	1	-18/+19
\| * \| \| \|	object-store: move object access functions to object-store.h	Stefan Beller	2018-05-16	1	-0/+1
* \| \| \| \|	Merge branch 'sb/plug-misc-leaks'	Junio C Hamano	2018-06-25	1	-1/+3
\|\ \ \ \ \
\| * \| \| \| \|	sequencer.c: plug mem leak in git_sequencer_config	Stefan Beller	2018-06-25	1	-0/+1
\| * \| \| \| \|	sequencer.c: plug leaks in do_pick_commit	Stefan Beller	2018-06-04	1	-1/+2
* \| \| \| \| \|	Merge branch 'nd/commit-util-to-slab'	Junio C Hamano	2018-06-25	1	-6/+18
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	sequencer.c: use commit-slab to associate todo items to commits	Nguyễn Thái Ngọc Duy	2018-05-21	1	-3/+9
\| * \| \| \| \|	sequencer.c: use commit-slab to mark seen commits	Nguyễn Thái Ngọc Duy	2018-05-21	1	-3/+9
* \| \| \| \| \|	Merge branch 'js/rebase-i-root-fix'	Junio C Hamano	2018-06-18	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rebase --root: fix amending root commit messages	Johannes Schindelin	2018-06-18	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'js/rebase-recreate-merge'	Junio C Hamano	2018-06-01	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	sequencer: ensure labels that are object IDs are rewritten	brian m. carlson	2018-05-30	1	-1/+1
* \| \| \| \| \| \| \|	Merge branch 'nd/command-list'	Junio C Hamano	2018-06-01	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move declaration for alias.c to alias.h	Nguyễn Thái Ngọc Duy	2018-05-21	1	-0/+1
* \| \| \| \| \| \| \|	Merge branch 'bc/object-id'	Junio C Hamano	2018-05-30	1	-2/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	sequencer: use the_hash_algo for empty tree object ID	brian m. carlson	2018-05-02	1	-1/+1
\| * \| \| \| \| \| \| \|	sequencer: convert one use of EMPTY_TREE_SHA1_HEX	brian m. carlson	2018-05-02	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'js/sequencer-and-root-commits'	Junio C Hamano	2018-05-30	1	-25/+181
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rebase --rebase-merges: root commits can be cousins, too	Johannes Schindelin	2018-05-06	1	-1/+2
\| * \| \| \| \| \| \| \|	rebase --rebase-merges: a "merge" into a new root is a fast-forward	Johannes Schindelin	2018-05-06	1	-0/+12
\| * \| \| \| \| \| \| \|	sequencer: allow introducing new root commits	Johannes Schindelin	2018-05-06	1	-12/+28
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	sequencer: learn about the special "fake root commit" handling	Johannes Schindelin	2018-05-06	1	-3/+121
\| * \| \| \| \| \| \|	sequencer: extract helper to update active_cache_tree	Johannes Schindelin	2018-05-06	1	-9/+18
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'js/rebase-recreate-merge'	Junio C Hamano	2018-05-23	1	-37/+855
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	Johannes Schindelin	2018-04-26	1	-0/+4
\| * \| \| \| \| \|	rebase --rebase-merges: avoid "empty merges"	Johannes Schindelin	2018-04-26	1	-0/+7
\| * \| \| \| \| \|	sequencer: handle post-rewrite for merge commands	Johannes Schindelin	2018-04-26	1	-1/+4