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

	Commit message (Expand)	Author	Age
*	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
\|\ \ \| \|/ \|/\|
\| *	cmd_merge(): remove unneeded flag variable	Michael Haggerty	2016-04-10
* \|	Merge branch 'jc/merge-refuse-new-root'	Junio C Hamano	2016-04-08
\|\ \
\| * \|	merge: refuse to create too cool a merge by default	Junio C Hamano	2016-03-23
\| \|/
* \|	Merge branch 'jv/merge-nothing-into-void'	Junio C Hamano	2016-04-06
\|\ \
\| * \|	merge: fix NULL pointer dereference when merging nothing into void	Junio C Hamano	2016-03-23
\| \|/
* \|	Merge branch 'mm/diff-renames-default'	Junio C Hamano	2016-04-03
\|\ \ \| \|/ \|/\|
\| *	diff: activate diff.renames by default	Matthieu Moy	2016-02-25
* \|	use st_add and st_mult for allocation size computation	Jeff King	2016-02-22
\|/
*	merge: release pack files before garbage-collecting	Johannes Schindelin	2016-01-13
*	Remove get_object_hash.	brian m. carlson	2015-11-20
*	Convert struct object to object_id	brian m. carlson	2015-11-20
*	Add several uses of get_object_hash.	brian m. carlson	2015-11-20
*	Merge branch 'rs/pop-commit'	Junio C Hamano	2015-10-30
\|\
\| *	use pop_commit() for consuming the first entry of a struct commit_list	René Scharfe	2015-10-26
* \|	Merge branch 'tk/stripspace'	Junio C Hamano	2015-10-26
\|\ \
\| * \|	strbuf: make stripspace() part of strbuf	Tobias Klauser	2015-10-16
* \| \|	use sha1_to_hex_r() instead of strcpy	Jeff King	2015-10-05
\|/ /
* \|	memoize common git-path "constant" files	Jeff King	2015-08-10
\|/
*	Merge branch 'jk/at-push-sha1'	Junio C Hamano	2015-06-05
\|\
\| *	remote.c: drop "remote" pointer from "struct branch"	Jeff King	2015-05-21
* \|	Merge branch 'jc/merge'	Junio C Hamano	2015-05-19
\|\ \
\| * \|	merge: deprecate 'git merge <message> HEAD <commit>' syntax	Junio C Hamano	2015-04-29
\| * \|	merge: handle FETCH_HEAD internally	Junio C Hamano	2015-04-29
\| * \|	merge: decide if we auto-generate the message early in collect_parents()	Junio C Hamano	2015-04-29
\| * \|	merge: make collect_parents() auto-generate the merge message	Junio C Hamano	2015-04-29
\| * \|	merge: extract prepare_merge_message() logic out	Junio C Hamano	2015-04-29
\| * \|	merge: narrow scope of merge_names	Junio C Hamano	2015-04-29
\| * \|	merge: split reduce_parents() out of collect_parents()	Junio C Hamano	2015-04-29
\| * \|	merge: clarify collect_parents() logic	Junio C Hamano	2015-04-29
\| * \|	merge: small leakfix and code simplification	Junio C Hamano	2015-04-29