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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint'	Junio C Hamano	2009-06-03
\|\
\| *	blame: correctly handle a path that used to be a directory	Junio C Hamano	2009-06-03
\| *	add -i: do not dump patch during application	Thomas Rast	2009-06-03
\| *	Update draft release notes for 1.6.3.2	Junio C Hamano	2009-06-02
\| *	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	Junio C Hamano	2009-06-02
\| \|\
\| \| *	Change xdl_merge to generate output even for null merges	Charles Bailey	2009-05-24
\| \| *	t6023: merge-file fails to output anything for a degenerate merge	Charles Bailey	2009-05-24
\| * \|	Merge branch 'rs/maint-grep-word-regexp-fix' into maint	Junio C Hamano	2009-06-02
\| \|\ \
\| \| * \|	grep: fix colouring of matches with zero length	René Scharfe	2009-06-01
\| * \| \|	Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint	Junio C Hamano	2009-06-02
\| \|\ \ \
\| * \ \ \	Merge branch 'jc/maint-add-p-coalesce-fix' into maint	Junio C Hamano	2009-06-02
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'tr/maint-doc-stash-pop' into maint	Junio C Hamano	2009-06-02
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Documentation: teach stash/pop workflow instead of stash/apply	Thomas Rast	2009-05-28
* \| \| \| \| \| \|	test-lib: fix http exit codes	Clemens Buchacher	2009-06-01
* \| \| \| \| \| \|	test-lib: allow exit trap to be used for cleanup by tests	Clemens Buchacher	2009-06-01
* \| \| \| \| \| \|	test-lib: fail if invalid options are passed	Clemens Buchacher	2009-06-01
* \| \| \| \| \| \|	git-show-branch.txt: document --date-order option	Stephen Boyd	2009-06-01
* \| \| \| \| \| \|	Merge branch 'sb/opt-filename'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	parse-opts: add OPT_FILENAME and transition builtins	Stephen Boyd	2009-05-25
\| * \| \| \| \| \| \|	parse-opts: prepare for OPT_FILENAME	Stephen Boyd	2009-05-25
\| * \| \| \| \| \| \|	Merge branch 'jc/mktree' into sb/opt-filename	Junio C Hamano	2009-05-25
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'sb/format-patch-parseopt' into sb/opt-filename	Junio C Hamano	2009-05-25
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'sb/show-branch-parse-options' into sb/opt-filename	Junio C Hamano	2009-05-25
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into sb/opt-filename	Junio C Hamano	2009-05-25
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/solaris-0811'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV	Junio C Hamano	2009-05-22
\| * \| \| \| \| \| \| \| \| \| \|	Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6	Junio C Hamano	2009-05-22
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sb/show-branch-parse-options'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	show-branch: migrate to parse-options API	Stephen Boyd	2009-05-22
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options	Junio C Hamano	2009-05-22
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's	Stephen Boyd	2009-05-22
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mm/apply-double-slash'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	apply: handle filenames with double slashes better	Michal Marek	2009-05-24
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sb/format-patch-parseopt'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	format-patch: migrate to parse-options API	Stephen Boyd	2009-05-17
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/mktree'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree: validate entry type in input	Josh Micich	2009-05-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree --batch: build more than one tree object	Josh Micich	2009-05-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree --missing: updated usage message and man page	Josh Micich	2009-05-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree --missing: allow missing objects	Junio C Hamano	2009-05-10
\| * \| \| \| \| \| \| \| \| \| \| \| \|	t1010: add mktree test	Junio C Hamano	2009-05-10
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree: do not barf on a submodule commit	Junio C Hamano	2009-05-10
\| * \| \| \| \| \| \| \| \| \| \| \| \|	builtin-mktree.c: use a helper function to handle one line of input	Junio C Hamano	2009-05-10
\| * \| \| \| \| \| \| \| \| \| \| \| \|	mktree: use parse-options	Junio C Hamano	2009-05-10
\| * \| \| \| \| \| \| \| \| \| \| \| \|	build-in git-mktree	Junio C Hamano	2009-05-10
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ew/svn-test-and-old-i18n'	Junio C Hamano	2009-05-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	t9139 uses ancient, backwards-compatible iconv names	Eric Wong	2009-05-30
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	t8005: fix typo, it's ISO-8859-5, not KOI8-R	Brandon Casey	2009-05-27
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	t8005: convert CP1251 character set to ISO8859-5	Brandon Casey	2009-05-22
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	t8005: use more portable character encoding names	Brandon Casey	2009-05-22