rhi/git -

	Commit message (Expand)	Author	Age	Files	Lines
*	Sync with v2.2.1	Junio C Hamano	2014-12-18	1	-4/+6
\|\
\| *	Sync with v2.0.5	Junio C Hamano	2014-12-17	1	-4/+6
\| \|\
\| \| *	Sync with v1.9.5	Junio C Hamano	2014-12-17	1	-4/+6
\| \| \|\
\| \| \| *	Sync with v1.8.5.6	Junio C Hamano	2014-12-17	1	-4/+6
\| \| \| \|\
\| \| \| \| *	Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5	Junio C Hamano	2014-12-17	1	-4/+6
\| \| \| \| \|\
\| \| \| \| \| *	unpack-trees: propagate errors adding entries to the index	Jeff King	2014-12-17	1	-4/+6
\| * \| \| \| \|	Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint	Junio C Hamano	2014-09-19	1	-21/+10
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch 'jc/unpack-trees-plug-leak'	Junio C Hamano	2014-12-12	1	-0/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	unpack_trees: plug leakage of o->result	Junio C Hamano	2014-11-17	1	-0/+2
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'	Junio C Hamano	2014-09-11	1	-21/+10
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	checkout -m: attempt merge when deletion of path was staged	Jonathan Nieder	2014-08-25	1	-5/+6
\| * \| \| \| \|	unpack-trees: use 'cuddled' style for if-else cascade	Jonathan Nieder	2014-08-13	1	-8/+4
\| * \| \| \| \|	unpack-trees: simplify 'all other failures' case	Stefan Beller	2014-08-13	1	-10/+2
\| \|/ / / /
\| * \| \| \|	Merge branch 'jk/two-way-merge-corner-case-fix' into maint	Junio C Hamano	2013-12-17	1	-8/+17
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'nd/split-index'	Junio C Hamano	2014-07-16	1	-3/+15
\|\ \ \ \ \
\| * \| \| \| \|	read-cache: mark updated entries for split index	Nguyễn Thái Ngọc Duy	2014-06-13	1	-1/+3
\| * \| \| \| \|	read-cache: split-index mode	Nguyễn Thái Ngọc Duy	2014-06-13	1	-0/+4
\| * \| \| \| \|	read-cache: save index SHA-1 after reading	Nguyễn Thái Ngọc Duy	2014-06-13	1	-0/+1
\| * \| \| \| \|	entry.c: update cache_changed if refresh_cache is set in checkout_entry()	Nguyễn Thái Ngọc Duy	2014-06-13	1	-0/+1
\| * \| \| \| \|	cache-tree: mark istate->cache_changed on cache tree invalidation	Nguyễn Thái Ngọc Duy	2014-06-13	1	-1/+1
\| * \| \| \| \|	unpack-trees: be specific what part of the index has changed	Nguyễn Thái Ngọc Duy	2014-06-13	1	-2/+6
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'jk/xstrfmt'	Junio C Hamano	2014-07-09	1	-11/+6
\|\ \ \ \ \
\| * \| \| \| \|	use xstrfmt in favor of manual size calculations	Jeff King	2014-06-19	1	-11/+6
\| \|/ / / /
* / / / /	cleanup duplicate name_compare() functions	Jeremiah Mahler	2014-06-20	1	-11/+0
\|/ / / /
* \| \| \|	Merge branch 'nd/i18n-progress'	Junio C Hamano	2014-03-14	1	-1/+1
\|\ \ \ \
\| * \| \| \|	i18n: mark all progress lines for translation	Nguyễn Thái Ngọc Duy	2014-02-24	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'kb/fast-hashmap'	Junio C Hamano	2014-02-27	1	-2/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	name-hash.c: remove cache entries instead of marking them CE_UNHASHED	Karsten Blees	2013-11-18	1	-1/+1
\| * \| \|	name-hash.c: use new hash map implementation for cache entries	Karsten Blees	2013-11-18	1	-1/+0
\| \|/ /
* \| \|	Prevent buffer overflows when path is too long	Antoine Pelisse	2013-12-16	1	-24/+27
* \| \|	Merge branch 'jk/two-way-merge-corner-case-fix'	Junio C Hamano	2013-12-05	1	-8/+17
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	unpack-trees: fix "read-tree -u --reset A B" with conflicted index	Jeff King	2013-11-04	1	-8/+17
* \|	employ new explicit "exists in index?" API	Eric Sunshine	2013-09-17	1	-2/+2
* \|	unpack-trees: plug a memory leak	Felipe Contreras	2013-08-13	1	-1/+3
* \|	Convert "struct cache_entry *" to "const ..." wherever possible	Nguyễn Thái Ngọc Duy	2013-07-09	1	-7/+7
* \|	Merge branch 'rs/unpack-trees-tree-walk-conflict-field'	Junio C Hamano	2013-06-24	1	-15/+3
\|\ \
\| * \|	unpack-trees: don't shift conflicts left and right	René Scharfe	2013-06-17	1	-15/+3
* \| \|	unpack-trees: free cache_entry array members for merges	René Scharfe	2013-06-02	1	-3/+10
* \| \|	diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const	René Scharfe	2013-06-02	1	-8/+13
* \| \|	diff-lib, read-tree, unpack-trees: mark cache_entry pointers const	René Scharfe	2013-06-02	1	-41/+50
* \| \|	unpack-trees: create working copy of merge entry in merged_entry	René Scharfe	2013-06-02	1	-5/+12
* \| \|	unpack-trees: factor out dup_entry	René Scharfe	2013-06-02	1	-3/+9
\|/ /
* \|	dir.c: replace is_path_excluded with now equivalent is_excluded API	Karsten Blees	2013-04-15	1	-9/+1
* \|	Merge branch 'as/check-ignore'	Junio C Hamano	2013-01-23	1	-1/+1
\|\ \
\| * \|	dir.c: use a single struct exclude_list per source of excludes	Adam Spiers	2013-01-06	1	-1/+1
* \| \|	Merge branch 'as/dir-c-cleanup'	Junio C Hamano	2013-01-10	1	-5/+7
\|\\| \|
\| * \|	dir.c: rename free_excludes() to clear_exclude_list()	Adam Spiers	2012-12-28	1	-1/+1
\| * \|	dir.c: rename excluded_from_list() to is_excluded_from_list()	Adam Spiers	2012-12-28	1	-3/+5
\| * \|	dir.c: rename path_excluded() to is_path_excluded()	Adam Spiers	2012-12-28	1	-1/+1
\| * \|	Merge branch 'jc/ls-files-i-dir' into maint	Junio C Hamano	2012-07-11	1	-1/+10
\| \|\ \