delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	trailer: add test with an old style conflict blockcc/interpret-trailers-more	Christian Couder	2014-11-10	1	-1/+31
*	trailer: reuse ignore_non_trailer() to ignore conflict lines	Christian Couder	2014-11-10	2	-7/+27
*	commit: make ignore_non_trailer() non static	Christian Couder	2014-11-10	3	-46/+49
*	Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more	Junio C Hamano	2014-11-10	6	-65/+110
\|\
\| *	merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint	Junio C Hamano	2014-10-28	3	-28/+68
\| *	builtin/commit.c: extract ignore_non_trailer() helper function	Junio C Hamano	2014-10-28	1	-26/+33
\| *	merge & sequencer: unify codepaths that write "Conflicts:" hint	Junio C Hamano	2014-10-24	3	-28/+26
\| *	builtin/merge.c: drop a parameter that is never used	Junio C Hamano	2014-10-24	1	-2/+2
\| *	git-tag.txt: Add a missing hyphen to `-s`	Wieland Hoffmann	2014-10-07	1	-1/+1
* \|	trailer: display a trailer without its trailing newlinecc/interpret-trailers	Christian Couder	2014-11-10	1	-2/+6
* \|	trailer: ignore comment lines inside the trailers	Christian Couder	2014-11-10	1	-2/+4
* \|	Documentation: add documentation for 'git interpret-trailers'	Christian Couder	2014-10-13	2	-0/+315
* \|	trailer: add tests for commands in config file	Christian Couder	2014-10-13	1	-0/+125
* \|	trailer: execute command from 'trailer.<name>.command'	Christian Couder	2014-10-13	1	-1/+84
* \|	trailer: add tests for "git interpret-trailers"	Christian Couder	2014-10-13	1	-0/+738
* \|	trailer: add interpret-trailers command	Christian Couder	2014-10-13	5	-0/+48
* \|	trailer: put all the processing together and print	Christian Couder	2014-10-13	2	-0/+75
* \|	trailer: parse trailers from file or stdin	Christian Couder	2014-10-13	1	-0/+123
* \|	trailer: process command line trailer arguments	Christian Couder	2014-10-13	1	-0/+112
* \|	trailer: read and process config information	Christian Couder	2014-10-13	1	-0/+185
* \|	trailer: process trailers from input message and arguments	Christian Couder	2014-10-13	1	-0/+210
* \|	trailer: add data structures and basic functions	Christian Couder	2014-10-13	2	-0/+70
* \|	Update draft release notes to 2.2	Junio C Hamano	2014-09-11	1	-1/+42
* \|	Merge branch 'br/imap-send-simplify-tunnel-child-process'	Junio C Hamano	2014-09-11	1	-10/+9
\|\ \
\| * \|	imap-send: simplify v_issue_imap_cmd() and get_cmd_result() using starts_with()br/imap-send-simplify-tunnel-child-process	René Scharfe	2014-09-02	1	-2/+2
\| * \|	imap-send.c: imap_folder -> imap_server_conf.folder	Bernhard Reiter	2014-08-20	1	-5/+5
\| * \|	git-imap-send: simplify tunnel construction	Bernhard Reiter	2014-08-18	1	-3/+2
* \| \|	Merge branch 'jk/name-decoration-alloc'	Junio C Hamano	2014-09-11	4	-21/+29
\|\ \ \
\| * \| \|	log-tree: use FLEX_ARRAY in name_decorationjk/name-decoration-alloc	Jeff King	2014-08-27	2	-2/+2
\| * \| \|	log-tree: make name_decoration hash static	Jeff King	2014-08-26	3	-5/+10
\| * \| \|	log-tree: make add_name_decoration a public function	Jeff King	2014-08-26	3	-14/+17
* \| \| \|	Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'	Junio C Hamano	2014-09-11	2	-21/+27
\|\ \ \ \
\| * \| \| \|	checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletion	Jonathan Nieder	2014-08-25	2	-5/+23
\| * \| \| \|	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 'rs/list-optim'	Junio C Hamano	2014-09-11	2	-3/+7
\|\ \ \ \
\| * \| \| \|	walker: avoid quadratic list insertion in mark_completers/list-optim	René Scharfe	2014-08-25	1	-2/+4
\| * \| \| \|	sha1_name: avoid quadratic list insertion in handle_one_ref	René Scharfe	2014-08-25	1	-1/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'jk/fast-import-fixes'	Junio C Hamano	2014-09-11	1	-4/+7
\|\ \ \ \
\| * \| \| \|	fast-import: fix buffer overflow in dump_tagsjk/top-level-refs-cleanup jk/fast-import-fixes	Jeff King	2014-08-25	1	-4/+6
\| * \| \| \|	fast-import: clean up pack_data pointer in end_packfile	Jeff King	2014-08-25	1	-4/+7
* \| \| \| \|	Merge branch 'jk/prune-top-level-refs-after-packing'	Junio C Hamano	2014-09-11	2	-1/+8
\|\ \ \ \ \
\| * \| \| \| \|	pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packing	Jeff King	2014-08-25	2	-1/+9
\| \|/ / / /
* \| \| \| \|	Merge branch 'nd/large-blobs'	Junio C Hamano	2014-09-11	9	-37/+125
\|\ \ \ \ \
\| * \| \| \| \|	diff: shortcut for diff'ing two binary SHA-1 objectsnd/large-blobs	Nguyễn Thái Ngọc Duy	2014-08-18	2	-0/+23
\| * \| \| \| \|	diff --stat: mark any file larger than core.bigfilethreshold binary	Nguyễn Thái Ngọc Duy	2014-08-18	5	-11/+27
\| * \| \| \| \|	diff.c: allow to pass more flags to diff_populate_filespec	Nguyễn Thái Ngọc Duy	2014-08-18	3	-9/+13
\| * \| \| \| \|	sha1_file.c: do not die failing to malloc in unpack_compressed_entry	Nguyễn Thái Ngọc Duy	2014-08-18	2	-1/+9
\| * \| \| \| \|	wrapper.c: introduce gentle xmallocz that does not die()	Nguyễn Thái Ngọc Duy	2014-08-18	2	-16/+53
* \| \| \| \| \|	Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'	Junio C Hamano	2014-09-11	1	-4/+6
\|\ \ \ \ \ \