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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/apply-trailing-blank-removal'	Junio C Hamano	2013-01-06
\|\
\| *	apply.c:update_pre_post_images(): the preimage can be truncated	Junio C Hamano	2012-10-12
\| *	Merge branch 'jc/apply-binary-p0' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \|\
\| * \	Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \|\ \
* \| \ \	Merge branch 'jc/apply-binary-p0'	Junio C Hamano	2012-09-07
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	apply: compute patch->def_name correctly under -p0	Junio C Hamano	2012-08-24
* \| \| \|	Merge branch 'nd/i18n-parseopt-help'	Junio C Hamano	2012-09-07
\|\ \ \ \
\| * \| \| \|	Use imperative form in help usage to describe an action	Nguyễn Thái Ngọc Duy	2012-08-22
* \| \| \| \|	Merge branch 'pg/maint-apply-remove-unused-variable'	Junio C Hamano	2012-08-22
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	apply: delete unused deflate_origlen from patch struct	Paul Gortmaker	2012-08-05
* \| \| \|	Merge branch 'tg/ce-namelen-field'	Junio C Hamano	2012-07-23
\|\ \ \ \
\| * \| \| \|	Strip namelen out of ce_flags into a ce_namelen field	Thomas Gummerer	2012-07-11
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'jc/sha1-name-more'	Junio C Hamano	2012-07-22
\|\ \ \ \
\| * \| \| \|	apply: --build-fake-ancestor expects blobs	Junio C Hamano	2012-07-09
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'jc/apply-3way'	Junio C Hamano	2012-07-15
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	apply: allow rerere() to work on --3way results	Junio C Hamano	2012-07-09
\| * \| \|	apply: register conflicted stages to the index	Junio C Hamano	2012-07-09
\| * \| \|	apply: --3way with add/add conflict	Junio C Hamano	2012-07-09
\| * \| \|	apply: move verify_index_match() higher	Junio C Hamano	2012-07-09
\| * \| \|	apply: plug the three-way merge logic in	Junio C Hamano	2012-07-09
\| * \| \|	apply: fall back on three-way merge	Junio C Hamano	2012-07-09
\| * \| \|	apply: accept -3/--3way command line option	Junio C Hamano	2012-07-09
\| * \| \|	apply: move "already exists" logic to check_to_create()	Junio C Hamano	2012-07-09
\| * \| \|	apply: move check_to_create_blob() closer to its sole caller	Junio C Hamano	2012-07-09
\| * \| \|	apply: further split load_preimage()	Junio C Hamano	2012-07-09
\| * \| \|	apply: refactor "previous patch" logic	Junio C Hamano	2012-07-09
\| * \| \|	apply: split load_preimage() helper function out	Junio C Hamano	2012-07-09
\| * \| \|	apply: factor out checkout_target() helper function	Junio C Hamano	2012-07-09
\| * \| \|	apply: refactor read_file_or_gitlink()	Junio C Hamano	2012-07-09
\| * \| \|	apply: clear_image() clears things a bit more	Junio C Hamano	2012-07-09
\| * \| \|	apply: a bit more comments on PATH_TO_BE_DELETED	Junio C Hamano	2012-07-09
\| * \| \|	apply: fix an incomplete comment in check_patch()	Junio C Hamano	2012-07-09
* \| \| \|	i18n: apply: split to fix a partial i18n message	Jiang Xin	2012-06-01
* \| \| \|	Merge branch 'nd/i18n-parseopt'	Junio C Hamano	2012-05-17
\|\ \ \ \
\| * \| \| \|	i18n: apply: mark parseopt strings for translation	Nguyễn Thái Ngọc Duy	2012-05-08
\| \|/ / /
* \| \| \|	apply: remove lego in i18n string in gitdiff_verify_name	Nguyễn Thái Ngọc Duy	2012-05-08
\|/ / /
* \| \|	Merge branch 'nd/i18n'	Junio C Hamano	2012-05-02
\|\ \ \
\| * \| \|	i18n: apply: update say_patch_name to give translators complete sentence	Nguyễn Thái Ngọc Duy	2012-04-24
\| * \| \|	i18n: apply: mark strings for translation	Nguyễn Thái Ngọc Duy	2012-04-24
* \| \| \|	Merge branch 'jh/apply-free-patch'	Junio C Hamano	2012-04-23
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	apply: document buffer ownership rules across functions	Junio C Hamano	2012-04-11
\| * \| \|	apply: tighten constness of line buffer	Junio C Hamano	2012-04-11
\| * \| \|	apply: drop unused macro	Junio C Hamano	2012-04-11
\| * \| \|	apply: free unused fragments for submodule patch	Junio C Hamano	2012-03-28
\| * \| \|	apply: free patch->result	Junio C Hamano	2012-03-27
\| * \| \|	apply: release memory for fn_table	Junio C Hamano	2012-03-27
\| * \| \|	apply: free patch->{def,old,new}_name fields	Junio C Hamano	2012-03-27
\| * \| \|	apply: rename free_patch() to free_patch_list()	Junio C Hamano	2012-03-27
\| * \| \|	apply: do not leak patches and fragments	Jared Hance	2012-03-07
\| * \| \|	Merge branch 'bc/maint-apply-check-no-patch' into maint	Junio C Hamano	2011-12-21
\| \|\ \ \