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

	Commit message (Expand)	Author	Age
*	Merge branch 'bc/format-patch-null-from-line'	Junio C Hamano	2015-12-21
\|\
\| *	format-patch: check that header line has expected format	brian m. carlson	2015-12-15
\| *	format-patch: add an option to suppress commit hash	brian m. carlson	2015-12-15
* \|	Merge branch 'mc/push-recurse-submodules-config'	Junio C Hamano	2015-12-21
\|\ \
\| * \|	push: follow the "last one wins" convention for --recurse-submodules	Mike Crowe	2015-12-04
\| * \|	push: test that --recurse-submodules on command line overrides config	Mike Crowe	2015-12-04
\| * \|	push: add recurseSubmodules config option	Mike Crowe	2015-11-20
\| \|/
* \|	Merge branch 'fr/rebase-i-continue-preserve-options'	Junio C Hamano	2015-12-16
\|\ \
\| * \|	rebase -i: remember merge options beyond continue actions	Fabian Ruch	2015-12-11
\| * \|	Merge branch 'cb/t3404-shellquote' into maint	Junio C Hamano	2015-12-11
\| \|\ \
\| * \ \	Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint	Junio C Hamano	2015-12-11
\| \|\ \ \
\| * \ \ \	Merge branch 'sg/bash-prompt-dirty-orphan' into maint	Junio C Hamano	2015-12-08
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'jk/rebase-no-autostash' into maint	Junio C Hamano	2015-12-08
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'da/difftool' into maint	Junio C Hamano	2015-12-04
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'dk/gc-idx-wo-pack' into maint	Junio C Hamano	2015-12-04
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	Merge branch 'ls/p4-keep-empty-commits'	Junio C Hamano	2015-12-15
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	git-p4: add option to keep empty commits	Lars Schneider	2015-12-10
* \| \| \| \| \| \| \| \| \|	Merge branch 'cb/t3404-shellquote'	Junio C Hamano	2015-12-11
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	t3404: fix quoting of redirect for some versions of bash	Charles Bailey	2015-12-04
* \| \| \| \| \| \| \| \| \|	Merge branch 'ls/test-must-fail-sigpipe'	Junio C Hamano	2015-12-08
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	add "ok=sigpipe" to test_must_fail and use it to fix flaky tests	Lars Schneider	2015-11-28
\| * \| \| \| \| \| \| \| \| \|	implement test_might_fail using a refactored test_must_fail	Lars Schneider	2015-11-28
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sg/bash-prompt-dirty-orphan'	Junio C Hamano	2015-12-04
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	bash prompt: indicate dirty index even on orphan branches	SZEDER Gábor	2015-11-24
\| * \| \| \| \| \| \| \| \|	bash prompt: test dirty index and worktree while on an orphan branch	SZEDER Gábor	2015-11-24
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/send-email-complete-aliases'	Junio C Hamano	2015-12-04
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	sendemail: teach git-send-email to dump alias names	Jacob Keller	2015-11-20
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/filter-branch-no-index'	Junio C Hamano	2015-12-04
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	filter-branch: skip index read/write when possible	Jeff King	2015-11-06
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mk/blame-first-parent'	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	blame: fix object casting regression	Jeff King	2015-11-24
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs/fsck-nul-header'	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	fsck: treat a NUL in a tag header as an error	René Scharfe	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	t1450: add tests for NUL in headers of commits and tags	René Scharfe	2015-11-20
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ls/p4-test-timeouts'	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	git-p4: add trap to kill p4d on test exit	Lars Schneider	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	git-p4: add p4d timeout in tests	Lars Schneider	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	git-p4: retry kill/cleanup operations in tests with timeout	Lars Schneider	2015-11-20
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'js/test-modernize-t9300'	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: move test preparations into test_expect_success	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: mark here-doc words to ignore tab indentation	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: use test_when_finished for clean-up	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: wrap lines after &&	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: use test_must_be_empty	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: use test_must_fail	Johannes Sixt	2015-11-20
\| * \| \| \| \| \| \| \| \| \| \| \|	modernize t9300: single-quote placement and indentation	Johannes Sixt	2015-11-20
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint'	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| / / / / / \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'eg/p4-submit-catch-failure' into maint	Jeff King	2015-12-01
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	git-p4: clean up after p4 submit failure	GIRARD Etienne	2015-11-24
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'ld/p4-detached-head' into maint	Jeff King	2015-12-01
\| \|\ \ \ \ \ \ \ \ \ \ \