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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/pending-keep-tag-name' into maint	Junio C Hamano	2016-01-04
\|\
\| *	revision.c: propagate tag names from pending array	Jeff King	2015-12-17
* \|	Merge branch 'jk/symbolic-ref-maint' into maint	Junio C Hamano	2016-01-04
\|\ \
\| * \|	t1401: test reflog creation for git-symbolic-ref	Jeff King	2015-12-21
\| * \|	symbolic-ref: propagate error code from create_symref()	Jeff King	2015-12-21
* \| \|	Merge branch 'ls/p4-keep-empty-commits' into maint	Junio C Hamano	2015-12-15
\|\ \ \
\| * \| \|	git-p4: add option to keep empty commits	Lars Schneider	2015-12-10
* \| \| \|	Merge branch 'cb/t3404-shellquote' into maint	Junio C Hamano	2015-12-11
\|\ \ \ \
\| * \| \| \|	t3404: fix quoting of redirect for some versions of bash	Charles Bailey	2015-12-04
* \| \| \| \|	Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint	Junio C Hamano	2015-12-11
\|\ \ \ \ \
\| * \| \| \| \|	test-lib-functions: detect test_when_finished in subshell	John Keeping	2015-09-08
\| * \| \| \| \|	t7800: don't use test_config in a subshell	John Keeping	2015-09-08
\| * \| \| \| \|	test-lib-functions: support "test_config -C <dir> ..."	John Keeping	2015-09-08
\| * \| \| \| \|	t5801: don't use test_when_finished in a subshell	John Keeping	2015-09-08
\| * \| \| \| \|	t7610: don't use test_config in a subshell	John Keeping	2015-09-08
* \| \| \| \| \|	Merge branch 'sg/bash-prompt-dirty-orphan' into maint	Junio C Hamano	2015-12-08
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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/rebase-no-autostash' into maint	Junio C Hamano	2015-12-08
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rebase: support --no-autostash	John Keeping	2015-09-10
* \| \| \| \| \| \| \|	Merge branch 'da/difftool' into maint	Junio C Hamano	2015-12-04
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	difftool: ignore symbolic links in use_wt_file	David Aguilar	2015-10-29
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'dk/gc-idx-wo-pack' into maint	Junio C Hamano	2015-12-04
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	gc: remove garbage .idx files from pack dir	Doug Kelly	2015-11-04
\| * \| \| \| \| \| \| \|	t5304: test cleaning pack garbage	Doug Kelly	2015-11-04
* \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	git-p4: work with a detached head	Luke Diamand	2015-11-24
\| * \| \| \| \| \| \| \| \| \|	git-p4: add failing test for submit from detached head	Luke Diamand	2015-11-24
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sg/filter-branch-dwim-ambiguity' into maint	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	filter-branch: deal with object name vs. pathname ambiguity in tree-filter	SZEDER Gábor	2015-11-24
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dk/t5813-unc-paths' into maint	Jeff King	2015-12-01
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	t5813: avoid creating urls that break on cygwin	Dennis Kaarsemaker	2015-11-20
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	allow hooks to ignore their standard input stream	Clemens Buchacher	2015-11-16
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs/wt-status-detached-branch-fix' into maint	Junio C Hamano	2015-11-05
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	wt-status: avoid building bogus branch name with detached HEAD	René Scharfe	2015-11-01
\| * \| \| \| \| \| \| \| \| \|	t7060: add test for status --branch on a detached HEAD	René Scharfe	2015-11-01
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/add-u-A-default-to-top' into maint	Junio C Hamano	2015-11-05
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	add: simplify -u/-A without pathspec	Junio C Hamano	2015-10-24
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/delete-modechange-conflict' into maint	Junio C Hamano	2015-11-05
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	merge: detect delete/modechange conflict	Jeff King	2015-10-26
\| * \| \| \| \| \| \| \| \| \| \| \|	t6031: generalize for recursive and resolve strategies	Jeff King	2015-10-26
\| * \| \| \| \| \| \| \| \| \| \| \|	t6031: move triple-rename test to t3030	Jeff King	2015-10-26
\| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'nd/clone-linked-checkout' into maint	Junio C Hamano	2015-11-05
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	clone: allow --local from a linked checkout	Nguyễn Thái Ngọc Duy	2015-09-28
\| * \| \| \| \| \| \| \| \| \| \| \|	enter_repo: allow .git files in strict mode	Nguyễn Thái Ngọc Duy	2015-09-28
\| * \| \| \| \| \| \| \| \| \| \| \|	enter_repo: avoid duplicating logic, use is_git_directory() instead	Nguyễn Thái Ngọc Duy	2015-09-28
\| * \| \| \| \| \| \| \| \| \| \| \|	t0002: add test for enter_repo(), non-strict mode	Nguyễn Thái Ngọc Duy	2015-09-28
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/merge-file-exit-code' into maint	Junio C Hamano	2015-11-03
\|\ \ \ \ \ \ \ \ \ \ \ \ \