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

	Commit message (Expand)	Author	Age
*	Merge branch 'jn/setup-revisions-glob-and-friends-passthru'	Junio C Hamano	2011-05-13
\|\
\| *	revisions: allow --glob and friends in parse_options-enabled commands	Jonathan Nieder	2011-04-21
* \|	Merge branch 'maint'	Junio C Hamano	2011-05-13
\|\ \
\| * \	Merge branch 'aw/maint-rebase-i-p-no-ff' into maint	Junio C Hamano	2011-05-13
\| \|\ \
\| * \ \	Merge branch 'js/blame-parsename' into maint	Junio C Hamano	2011-05-13
\| \|\ \ \
\| * \ \ \	Merge branch 'jk/merge-one-file-working-tree' into maint	Junio C Hamano	2011-05-13
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'jc/fix-diff-files-unmerged' into maint	Junio C Hamano	2011-05-13
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'mz/maint-rename-unmerged' into maint	Junio C Hamano	2011-05-13
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	t5400: Fix a couple of typos	Johan Herland	2011-05-13
* \| \| \| \| \| \| \|	Merge branch 'nd/struct-pathspec'	Junio C Hamano	2011-05-12
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Tweak t3102-ls-tree-wildcards to run on Windows	Johannes Sixt	2011-05-12
* \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-branch-mergeoptions'	Junio C Hamano	2011-05-11
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	merge: make branch.<name>.mergeoptions correctly override merge.<option>	Junio C Hamano	2011-05-06
* \| \| \| \| \| \| \| \| \|	Merge branch 'jn/maint-test-merge-verify-parents'	Junio C Hamano	2011-05-11
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	tests: teach verify_parents to check for extra parents	Jonathan Nieder	2011-05-06
\| * \| \| \| \| \| \| \| \| \|	tests: eliminate unnecessary setup test assertions	Jonathan Nieder	2011-05-06
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-add-p-overlapping-hunks'	Junio C Hamano	2011-05-11
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	t3701: add-p-fix makes the last test to pass	Junio C Hamano	2011-05-08
\| * \| \| \| \| \| \| \| \| \|	t3701: Editing a split hunk in an "add -p" session	Junio C Hamano	2011-04-29
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm/http-cleanup'	Junio C Hamano	2011-05-11
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	t5541-http-push: add test for chunked	Tay Ray Chuan	2011-05-04
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/ctags'	Junio C Hamano	2011-05-11
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	gitweb: Restructure projects list generation	Jakub Narebski	2011-04-29
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jn/run-command-error-failure'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	tests: check error message from run_command	Jonathan Nieder	2011-04-20
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/merge-one-file-working-tree'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	merge-one-file: fix broken merges with alternate work trees	Jeff King	2011-04-29
\| * \| \| \| \| \| \| \| \| \| \| \|	add tests for merge-index / merge-one-file	Jeff King	2011-04-29
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/fix-diff-files-unmerged'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	diff-files: show unmerged entries correctly	Junio C Hamano	2011-04-23
\| * \| \| \| \| \| \| \| \| \| \| \|	test: use $_z40 from test-lib	Junio C Hamano	2011-04-23
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'js/blame-parsename'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	t/annotate-tests: Use echo & cat instead of sed	Brian Gernhardt	2011-05-05
\| * \| \| \| \| \| \| \| \| \| \| \|	blame: tolerate bogus e-mail addresses a bit better	Josh Stone	2011-04-29
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/format-patch-quote-special-in-from'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	pretty: quote rfc822 specials in email addresses	Jeff King	2011-04-26
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'nd/struct-pathspec'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Convert read_tree{,_recursive} to support struct pathspec	Nguyễn Thái Ngọc Duy	2011-03-25
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'aw/maint-rebase-i-p-no-ff'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff	Andrew Wong	2011-04-28
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg/alias-expose-prefix'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	handle_alias: provide GIT_PREFIX to !alias	Michael J Gruber	2011-04-27
\| * \| \| \| \| \| \| \| \| \| \| \|	t1020: test !alias in subdirectory	Michael J Gruber	2011-04-27
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2011-05-05
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	t3701: fix here document	Junio C Hamano	2011-05-05
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'jh/dirstat' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/maint-stash-oob' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dm/stash-k-i-p' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mg/reflog-with-options' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/stash-loosen-safety' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \