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

	Commit message (Expand)	Author	Age
...
* \| \| \| \|	Merge branch 'mh/verify-lock-error-report'	Junio C Hamano	2015-06-11
\|\ \ \ \ \
\| * \| \| \| \|	ref_transaction_commit(): do not capitalize error messages	Michael Haggerty	2015-05-27
\| * \| \| \| \|	verify_lock(): do not capitalize error messages	Michael Haggerty	2015-05-27
\| * \| \| \| \|	verify_lock(): report errors via a strbuf	Michael Haggerty	2015-05-27
\| * \| \| \| \|	verify_lock(): on errors, let the caller unlock the lock	Michael Haggerty	2015-05-27
\| * \| \| \| \|	verify_lock(): return 0/-1 rather than struct ref_lock *	Michael Haggerty	2015-05-27
* \| \| \| \| \|	Merge branch 'jk/color-diff-plain-is-context'	Junio C Hamano	2015-06-11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT	Jeff King	2015-05-27
\| * \| \| \| \| \|	diff: accept color.diff.context as a synonym for "plain"	Jeff King	2015-05-27
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jk/clone-dissociate'	Junio C Hamano	2015-06-11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	clone: reorder --dissociate and --reference options	Jeff King	2015-05-27
\| * \| \| \| \| \|	clone: use OPT_STRING_LIST for --reference	Jeff King	2015-05-27
* \| \| \| \| \| \|	Merge branch 'jc/diff-ws-error-highlight'	Junio C Hamano	2015-06-11
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff.c: --ws-error-highlight=<kind> option	Junio C Hamano	2015-05-26
\| * \| \| \| \| \| \|	diff.c: add emit_del_line() and emit_context_line()	Junio C Hamano	2015-05-26
\| * \| \| \| \| \| \|	t4015: separate common setup and per-test expectation	Junio C Hamano	2015-05-26
\| * \| \| \| \| \| \|	t4015: modernise style	Junio C Hamano	2015-05-26
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Sync with 2.4.3	Junio C Hamano	2015-06-05
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Git 2.4.3v2.4.3	Junio C Hamano	2015-06-05
\| * \| \| \| \| \| \|	Merge branch 'dl/branch-error-message' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'jk/skip-http-tests-under-no-curl' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'ps/doc-packfile-vs-pack-file' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'fg/document-commit-message-stripping' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/rerere-forget-check-enabled' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'pt/pull-log-n' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'pt/pull-ff-vs-merge-ff' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ja/tutorial-asciidoctor-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/stripspace-asciidoctor-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/asciidoc-markup-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ps/bundle-verify-arg' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mh/write-refs-sooner-2.4' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mh/ref-directory-file' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mg/log-decorate-HEAD' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'sb/t1020-cleanup' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/gitignore-precedence' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'bc/connect-plink' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ph/rebase-i-redo' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/add-e-kill-editor' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mh/clone-verbosity-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'tb/blame-resurrect-convert-to-git' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/plug-fmt-merge-msg-leak' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'pt/xdg-config-path' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The first half of the seventh batch for 2.5	Junio C Hamano	2015-06-05
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ld/p4-editor-multi-words'	Junio C Hamano	2015-06-05
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-p4: tests: use test-chmtime in place of touch	Luke Diamand	2015-05-26
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-p4: fix handling of multi-word P4EDITOR	Luke Diamand	2015-05-24
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-p4: add failing test for P4EDITOR handling	Luke Diamand	2015-05-24
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bc/object-id'	Junio C Hamano	2015-06-05
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \