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

	Commit message (Expand)	Author	Age
*	Merge branch 'cc/interpret-trailers-more'	Junio C Hamano	2014-12-22
\|\
\| *	Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more	Junio C Hamano	2014-11-10
\| \|\
\| \| *	merge & sequencer: turn "Conflicts:" hint into a comment	Junio C Hamano	2014-10-28
\| \| *	merge & sequencer: unify codepaths that write "Conflicts:" hint	Junio C Hamano	2014-10-24
* \| \|	refs.c: change resolve_ref_unsafe reading argument to be a flags field	Ronnie Sahlberg	2014-10-15
* \| \|	refs.c: pass the ref log message to _create/delete/update instead of _commit	Ronnie Sahlberg	2014-10-15
* \| \|	lockfile.h: extract new header file for the functions in lockfile.c	Michael Haggerty	2014-10-01
\|/ /
* \|	Merge branch 'rs/ref-transaction-1'	Junio C Hamano	2014-09-11
\|\ \
\| * \|	sequencer.c: use ref transactions for all ref updates	Ronnie Sahlberg	2014-09-03
* \| \|	Merge branch 'nd/split-index'	Junio C Hamano	2014-07-16
\|\ \ \
\| * \| \|	cache-tree: mark istate->cache_changed on cache tree update	Nguyễn Thái Ngọc Duy	2014-06-13
\| * \| \|	read-cache: new API write_locked_index instead of write_index/write_cache	Nguyễn Thái Ngọc Duy	2014-06-13
\| * \| \|	sequencer: do not update/refresh index if the lock cannot be held	Nguyễn Thái Ngọc Duy	2014-04-29
* \| \| \|	Merge branch 'jk/xstrfmt'	Junio C Hamano	2014-07-09
\|\ \ \ \
\| * \| \| \|	sequencer: use argv_array_pushf	Jeff King	2014-06-19
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'jk/commit-buffer-length'	Junio C Hamano	2014-07-02
\|\ \ \ \
\| * \| \| \|	commit: record buffer length in cache	Jeff King	2014-06-13
\| * \| \| \|	use get_commit_buffer everywhere	Jeff King	2014-06-13
\| * \| \| \|	convert logmsg_reencode to get_commit_buffer	Jeff King	2014-06-13
\| * \| \| \|	sequencer: use logmsg_reencode in get_message	Jeff King	2014-06-12
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'	Junio C Hamano	2014-06-25
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	sequencer: signal failed ff as an aborted, not a conflicted merge	Fabian Ruch	2014-06-09
\| \|/ /
* \| \|	sequencer.c: check for lock failure and bail early in fast_forward_to	Ronnie Sahlberg	2014-04-17
\|/ /
* \|	cherry-pick, revert: add the --gpg-sign option	Nicolas Vigier	2014-01-27
* \|	replace {pre,suf}fixcmp() with {starts,ends}_with()	Christian Couder	2013-12-05
\|/
*	refs: report ref type from lock_any_ref_for_update	Brad King	2013-08-30
*	Convert "struct cache_entry *" to "const ..." wherever possible	Nguyễn Thái Ngọc Duy	2013-07-09
*	Merge branch 'rr/cherry-pick-fast-forward-reflog-message'	Junio C Hamano	2013-06-27
\|\
\| *	sequencer: write useful reflog message for fast-forward	Ramkumar Ramachandra	2013-06-19
* \|	sequencer: avoid leaking message buffer when refusing to create an empty commit	Felipe Contreras	2013-06-06
* \|	sequencer: remove useless indentation	Felipe Contreras	2013-06-03
\|/
*	Merge branch 'mv/sequencer-pick-error-diag'	Junio C Hamano	2013-05-09
\|\
\| *	cherry-pick: picking a tag that resolves to a commit is OK	Junio C Hamano	2013-05-09
* \|	Merge branch 'mv/sequencer-pick-error-diag'	Junio C Hamano	2013-04-19
\|\ \ \| \|/
\| *	cherry-pick: make sure all input objects are commits	Miklos Vajna	2013-04-11
* \|	Sync with 'maint'	Junio C Hamano	2013-04-12
\|\ \ \| \|/ \|/\|
\| *	Correct common spelling mistakes in comments and tests	Stefano Lattarini	2013-04-12
* \|	Merge branch 'bc/append-signed-off-by'	Junio C Hamano	2013-04-01
\|\ \ \| \|/ \|/\|
\| *	git-commit: populate the edit buffer with 2 blank lines before s-o-b	Brandon Casey	2013-02-23
\| *	sequencer.c: teach append_signoff to avoid adding a duplicate newline	Brandon Casey	2013-02-12
\| *	sequencer.c: teach append_signoff how to detect duplicate s-o-b	Brandon Casey	2013-02-12
\| *	sequencer.c: always separate "(cherry picked from" from commit body	Brandon Casey	2013-02-12
\| *	sequencer.c: require a conforming footer to be preceded by a blank line	Brandon Casey	2013-02-12
\| *	sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer	Brandon Casey	2013-02-12
\| *	commit, cherry-pick -s: remove broken support for multiline rfc2822 fields	Brandon Casey	2013-02-12
\| *	sequencer.c: rework search for start of footer to improve clarity	Jonathan Nieder	2013-02-12
* \|	learn to pick/revert into unborn branch	Martin von Zweigbergk	2012-12-23
\|/
*	Merge branch 'jc/same-encoding'	Junio C Hamano	2012-11-15
\|\
\| *	reencode_string(): introduce and use same_encoding()	Junio C Hamano	2012-11-04
* \|	Move try_merge_command and checkout_fast_forward to libgit.a	Nguyễn Thái Ngọc Duy	2012-10-29