org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'mg/killed-merge'	Junio C Hamano	2017-08-26
\|\
\| *	merge: save merge state earlier	Michael J Gruber	2017-08-23
\| *	merge: split write_merge_state in two	Michael J Gruber	2017-08-23
\| *	merge: clarify call chain	Michael J Gruber	2017-08-23
* \|	Merge branch 'jt/packmigrate'	Junio C Hamano	2017-08-26
\|\ \
\| * \|	pack: move pack-closing functions	Jonathan Tan	2017-08-23
* \| \|	Merge branch 'lg/merge-signoff'	Junio C Hamano	2017-08-24
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge: add a --signoff flag	Łukasz Gryglicki	2017-07-25
\| \|/
* \|	Merge branch 'rs/merge-microcleanup'	Junio C Hamano	2017-08-22
\|\ \
\| * \|	merge: use skip_prefix()	René Scharfe	2017-08-10
* \| \|	Merge branch 'ma/parse-maybe-bool'	Junio C Hamano	2017-08-22
\|\ \ \
\| * \| \|	treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool	Martin Ågren	2017-08-07
* \| \| \|	use MOVE_ARRAY	René Scharfe	2017-07-17
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'bw/config-h'	Junio C Hamano	2017-06-24
\|\ \ \
\| * \| \|	config: don't include config.h by default	Brandon Williams	2017-06-15
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'bw/object-id'	Junio C Hamano	2017-06-19
\|\ \ \
\| * \| \|	diff-tree: convert diff_tree_sha1 to struct object_id	Brandon Williams	2017-06-05
* \| \| \|	Merge branch 'nd/fopen-errors'	Junio C Hamano	2017-06-13
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	use xfopen() in more places	Nguyễn Thái Ngọc Duy	2017-05-26
\| \|/ /
* \| \|	tree: convert parse_tree_indirect to struct object_id	brian m. carlson	2017-05-08
* \| \|	merge: convert checkout_fast_forward to struct object_id	brian m. carlson	2017-05-08
* \| \|	Convert lookup_commit* to struct object_id	brian m. carlson	2017-05-08
\|/ /
* \|	Merge branch 'bc/object-id'	Junio C Hamano	2017-04-19
\|\ \
\| * \|	Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ	brian m. carlson	2017-03-26
* \| \|	Merge branch 'jc/merge-drop-old-syntax'	Junio C Hamano	2017-03-30
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge: drop 'git merge <message> HEAD <commit>' syntax	Junio C Hamano	2015-04-29
* \| \|	Merge branch 'bc/object-id'	Junio C Hamano	2017-03-17
\|\ \ \
\| * \| \|	builtin/merge: convert to struct object_id	brian m. carlson	2017-02-22
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'jk/interpret-branch-name'	Junio C Hamano	2017-03-14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	interpret_branch_name: allow callers to restrict expansions	Jeff King	2017-03-02
* \| \|	Merge branch 'cp/merge-continue'	Junio C Hamano	2016-12-27
\|\ \ \
\| * \| \|	merge: mark usage error strings for translation	Jeff King	2016-12-15
\| * \| \|	merge: ensure '--abort' option takes no arguments	Chris Packham	2016-12-14
\| * \| \|	merge: add '--continue' option as a synonym for 'git commit'	Chris Packham	2016-12-14
\| \|/ /
* \| \|	hold_locked_index(): align error handling with hold_lockfile_for_update()	Junio C Hamano	2016-12-07
\|/ /
* \|	find_unique_abbrev: use 4-buffer ring	Jeff King	2016-10-26
* \|	use strbuf_addstr() for adding constant strings to a strbuf, part 2	René Scharfe	2016-09-15
* \|	Merge branch 'rs/merge-add-strategies-simplification'	Junio C Hamano	2016-08-12
\|\ \
\| * \|	merge: use string_list_split() in add_strategies()	René Scharfe	2016-08-05
* \| \|	prepare the builtins for a libified merge_recursive()	Johannes Schindelin	2016-07-26
* \| \|	Merge branch 'jk/write-file'	Junio C Hamano	2016-07-19
\|\ \ \
\| * \| \|	use write_file_buf where applicable	Jeff King	2016-07-08
\| \|/ /
* \| \|	Merge branch 'bc/cocci'	Junio C Hamano	2016-07-19
\|\ \ \
\| * \| \|	coccinelle: apply object_id Coccinelle transformations	brian m. carlson	2016-06-28
\| * \| \|	coccinelle: convert hashcpy() with null_sha1 to hashclr()	brian m. carlson	2016-06-28
\| \|/ /
* \| \|	i18n: merge: change command option help to lowercase	Vasco Almeida	2016-06-17
* \| \|	i18n: merge: mark messages for translation	Vasco Almeida	2016-06-17
\|/ /
* \|	Merge branch 'en/merge-trivial-fix'	Junio C Hamano	2016-04-25
\|\ \
\| * \|	builtin/merge.c: fix a bug with trivial merges	Elijah Newren	2016-04-12
* \| \|	Merge branch 'dt/pre-refs-backend'	Junio C Hamano	2016-04-25
\|\ \ \ \| \|/ / \|/\| \|