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

	Commit message (Expand)	Author	Age
*	Merge branch 'rs/xdiff-hunk-with-func-line'	Junio C Hamano	2016-06-20
\|\
\| *	xdiff: fix merging of appended hunk with -W	René Scharfe	2016-06-09
\| *	grep: -W: don't extend context to trailing empty lines	René Scharfe	2016-05-31
\| *	t7810: add test for grep -W and trailing empty context lines	René Scharfe	2016-05-31
\| *	xdiff: don't trim common tail with -W	René Scharfe	2016-05-31
\| *	xdiff: -W: don't include common trailing empty lines in context	René Scharfe	2016-05-31
\| *	xdiff: ignore empty lines before added functions with -W	René Scharfe	2016-05-31
\| *	xdiff: handle appended chunks better with -W	René Scharfe	2016-05-31
\| *	t4051: rewrite, add more tests	René Scharfe	2016-05-31
* \|	Merge branch 'jk/rev-list-count-with-bitmap'	Junio C Hamano	2016-06-20
\|\ \
\| * \|	rev-list: "adjust" results of "--count --use-bitmap-index -n"	Jeff King	2016-06-03
* \| \|	Merge branch 'wd/userdiff-css'	Junio C Hamano	2016-06-20
\|\ \ \
\| * \| \|	userdiff: add built-in pattern for CSS	William Duclot	2016-06-03
* \| \| \|	Merge branch 'jg/dash-is-last-branch-in-worktree-add'	Junio C Hamano	2016-06-20
\|\ \ \ \
\| * \| \| \|	worktree: allow "-" short-hand for @{-1} in add command	Jordan DE GEA	2016-05-31
* \| \| \| \|	Merge branch 'et/pretty-format-c-auto'	Junio C Hamano	2016-06-20
\|\ \ \ \ \
\| * \| \| \| \|	format_commit_message: honor `color=auto` for `%C(auto)`	Edward Thomson	2016-05-27
* \| \| \| \| \|	Merge branch 'sb/submodule-recommend-shallowness'	Junio C Hamano	2016-06-20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	submodule update: learn `--[no-]recommend-shallow` option	Stefan Beller	2016-05-27
* \| \| \| \| \| \|	Merge branch 'ah/no-verify-signature-with-pull-rebase'	Junio C Hamano	2016-06-20
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	pull: warn on --verify-signatures with --rebase	Alexander Hirsch	2016-05-20
* \| \| \| \| \| \| \|	Merge branch 'ew/fast-import-unpack-limit'	Junio C Hamano	2016-06-20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fast-import: invalidate pack_id references after loosening	Eric Wong	2016-05-29
\| * \| \| \| \| \| \| \|	fast-import: implement unpack limit	Eric Wong	2016-05-11
* \| \| \| \| \| \| \| \|	Merge branch 'jk/shell-portability'	Junio C Hamano	2016-06-10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	t5500 & t7403: lose bash-ism "local"	Junio C Hamano	2016-06-01
\| * \| \| \| \| \| \| \| \|	test-lib: add in-shell "env" replacement	Jeff King	2016-06-01
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jc/t2300-setup'	Junio C Hamano	2016-06-10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	t2300: run git-sh-setup in an environment that better mimics the real life	Junio C Hamano	2016-06-01
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'sb/submodule-deinit-all' into maint	Junio C Hamano	2016-05-31
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint	Junio C Hamano	2016-05-31
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'js/name-rev-use-oldest-ref' into maint	Junio C Hamano	2016-05-31
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/fsck-nul-in-commit' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'js/windows-dotgit' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'lp/typofixes' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'sb/z-is-gnutar-ism' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'va/i18n-misc-updates' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ak/t4151-ls-files-could-be-empty' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/test-seq' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'tb/t5601-sed-fix' into maint	Junio C Hamano	2016-05-26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sb/clean-test-fix' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'sg/test-lib-simplify-expr-away' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'js/close-packs-before-gc' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ls/p4-lfs' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'nf/mergetool-prompt' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/push-client-deadlock-fix' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'sb/mv-submodule-fix' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ld/p4-test-py3' into HEAD	Junio C Hamano	2016-05-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'js/perf-rebase-i'	Junio C Hamano	2016-06-03
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \