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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...	Junio C Hamano	2009-01-27
\|\
\| *	diff.c: output correct index lines for a split diff	Junio C Hamano	2009-01-27
* \|	Merge branch 'cb/maint-unpack-trees-absense' into maint	Junio C Hamano	2009-01-23
\|\ \
\| * \|	unpack-trees: fix path search bug in verify_absent	Clemens Buchacher	2009-01-05
\| * \|	unpack-trees: handle failure in verify_absent	Clemens Buchacher	2009-01-05
* \| \|	Merge branch 'tr/maint-no-index-fixes' into maint	Junio C Hamano	2009-01-23
\|\ \ \
\| * \| \|	diff: accept -- when using --no-index	Thomas Rast	2009-01-06
* \| \| \|	Merge branch 'js/add-not-submodule' into maint	Junio C Hamano	2009-01-23
\|\ \ \ \
\| * \| \| \|	git add: do not add files from a submodule	Johannes Schindelin	2009-01-05
* \| \| \| \|	Rename diff.suppress-blank-empty to diff.suppressBlankEmpty	Johannes Schindelin	2009-01-21
* \| \| \| \|	t5540: clarify that http-push does not handle packed-refs on the remote	Johannes Schindelin	2009-01-17
* \| \| \| \|	http-push: when making directories, have a trailing slash in the path name	Johannes Schindelin	2009-01-17
* \| \| \| \|	Merge branch 'maint-1.6.0' into maint	Junio C Hamano	2009-01-15
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	t3404: Add test case for auto-amending only edited commits after "edit"	Stephan Beyer	2009-01-15
\| * \| \| \|	t3404: Add test case for aborted --continue after "edit"	Stephan Beyer	2009-01-15
\| * \| \| \|	t3501: check that commits are actually done	Stephan Beyer	2009-01-15
* \| \| \| \|	Merge branch 'maint-1.6.0' into maint	Junio C Hamano	2009-01-14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	fix handling of multiple untracked files for git mv -k	Michael J Gruber	2009-01-14
\| * \| \| \|	add test cases for "git mv -k"	Michael J Gruber	2009-01-14
* \| \| \| \|	Make t3411 executable	Miklos Vajna	2009-01-14
* \| \| \| \|	Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint	Junio C Hamano	2009-01-13
\|\ \ \ \ \
\| * \| \| \| \|	merge-recursive: mark rename/delete conflict as unmerged	Johannes Schindelin	2008-12-24
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'cb/maint-merge-recursive-fix' into maint	Junio C Hamano	2009-01-13
\|\ \ \ \ \
\| * \| \| \| \|	merge-recursive: do not clobber untracked working tree garbage	Junio C Hamano	2008-12-15
\| * \| \| \| \|	modify/delete conflict resolution overwrites untracked file	Clemens Buchacher	2008-12-15
* \| \| \| \| \|	Merge branch 'ap/maint-apply-modefix' into maint	Junio C Hamano	2009-01-13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	builtin-apply: prevent non-explicit permission changes	Junio C Hamano	2009-01-02
* \| \| \| \| \| \|	Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint	Junio C Hamano	2009-01-11
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	git checkout: do not allow switching to a tree-ish that is not a commit	Junio C Hamano	2009-01-03
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sp/maint-describe-all-tag-warning' into maint	Junio C Hamano	2008-12-27
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	describe: Avoid unnecessary warning when using --all	Shawn O. Pearce	2008-12-26
* \| \| \| \| \| \|	Merge branch 'js/rebase-i-p'	Junio C Hamano	2008-12-24
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rebase -i -p: leave a --cc patch when a merge could not be redone	Johannes Schindelin	2008-12-24
\| * \| \| \| \| \| \|	rebase -i -p: Fix --continue after a merge could not be redone	Johannes Sixt	2008-12-21
\| * \| \| \| \| \| \|	Show a failure of rebase -p if the merge had a conflict	Johannes Sixt	2008-12-21
* \| \| \| \| \| \| \|	t9129: skip the last three tests if UTF-8 locale is not available	Miklos Vajna	2008-12-22
* \| \| \| \| \| \| \|	Make sure lockfiles are unlocked when dying on SIGPIPE	Junio C Hamano	2008-12-21
* \| \| \| \| \| \| \|	git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir	Marcel M. Cary	2008-12-21
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'maint' to sync with GIT 1.6.0.6	Junio C Hamano	2008-12-19
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	fast-import: make tagger information optional	Junio C Hamano	2008-12-19
\| * \| \| \| \| \|	fast-export: deal with tag objects that do not have a tagger	Johannes Schindelin	2008-12-19
* \| \| \| \| \| \|	test overlapping ignore patterns	Michael J Gruber	2008-12-18
* \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-12-15
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	git-show: do not segfault when showing a bad tag	Junio C Hamano	2008-12-15
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3	Johannes Schindelin	2008-12-14
* \| \| \| \| \|	git-branch: display sha1 on branch deletion	Brandon Casey	2008-12-12
* \| \| \| \| \|	Fix t4031	Junio C Hamano	2008-12-10
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-12-09
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	git-svn: Make following parents atomic	Deskin Miller	2008-12-08
\| * \| \| \| \|	"git diff <tree>{3,}": do not reverse order of arguments	Matt McCutchen	2008-12-07