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

	Commit message (Expand)	Author	Age
*	Merge branch 'jm/mergetool-submodules' into maint	Junio C Hamano	2011-05-15
\|\
\| *	mergetool: Teach about submodules	Jonathon Mah	2011-04-13
* \|	Merge branch 'jk/format-patch-quote-special-in-from' into maint	Junio C Hamano	2011-05-15
\|\ \
\| * \|	pretty: quote rfc822 specials in email addresses	Jeff King	2011-04-26
* \| \|	Merge branch 'aw/maint-rebase-i-p-no-ff' into maint	Junio C Hamano	2011-05-13
\|\ \ \
\| * \| \|	git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff	Andrew Wong	2011-04-28
\| \|/ /
* \| \|	Merge branch 'js/blame-parsename' into maint	Junio C Hamano	2011-05-13
\|\ \ \
\| * \| \|	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/merge-one-file-working-tree' into maint	Junio C Hamano	2011-05-13
\|\ \ \ \
\| * \| \| \|	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' into maint	Junio C Hamano	2011-05-13
\|\ \ \ \ \
\| * \| \| \| \|	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 'mz/maint-rename-unmerged' into maint	Junio C Hamano	2011-05-13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diffcore-rename: don't consider unmerged path as source	Martin von Zweigbergk	2011-03-23
* \| \| \| \| \| \|	t5400: Fix a couple of typos	Johan Herland	2011-05-13
* \| \| \| \| \| \|	t3701: fix here document	Junio C Hamano	2011-05-05
* \| \| \| \| \| \|	Merge branch 'jh/dirstat' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Teach --dirstat not to completely ignore rearranged lines within a file	Johan Herland	2011-04-11
\| * \| \| \| \| \| \|	--dirstat-by-file: Make it faster and more correct	Johan Herland	2011-04-11
\| * \| \| \| \| \| \|	--dirstat: Describe non-obvious differences relative to --stat or regular diff	Johan Herland	2011-04-11
* \| \| \| \| \| \| \|	Merge branch 'jk/maint-stash-oob' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	stash: fix false positive in the invalid ref test.	Jon Seymour	2011-04-05
\| * \| \| \| \| \| \| \|	stash: fix accidental apply of non-existent stashes	Jeff King	2011-04-05
* \| \| \| \| \| \| \| \|	Merge branch 'dm/stash-k-i-p' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	stash: ensure --no-keep-index and --patch can be used in any order	Dan McGee	2011-04-07
\| * \| \| \| \| \| \| \| \|	stash: add two more tests for --no-keep-index	Dan McGee	2011-04-07
* \| \| \| \| \| \| \| \| \|	Merge branch 'mg/reflog-with-options' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	reflog: fix overriding of command line options	Michael J Gruber	2011-04-01
\| * \| \| \| \| \| \| \| \| \|	t/t1411: test reflog with formats	Michael J Gruber	2011-04-01
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/stash-loosen-safety' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	stash: drop dirty worktree check on apply	Jeff King	2011-04-06
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ar/clean-rmdir-empty' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	clean: unreadable directory may still be rmdir-able if it is empty	Alex Riesen	2011-04-01
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg/sha1-path-advise' into maint	Junio C Hamano	2011-05-04
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	sha1_name: Suggest commit:./file for path in subdir	Michael J Gruber	2011-04-03
\| * \| \| \| \| \| \| \| \| \| \|	t1506: factor out test for "Did you mean..."	Michael J Gruber	2011-04-03
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg/x-years-12-months' into maint	Junio C Hamano	2011-04-29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	date: avoid "X years, 12 months" in relative dates	Michael J Gruber	2011-04-20
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2011-04-14
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	t3306,t5304: avoid clock skew issues	Michael J Gruber	2011-04-14
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'js/checkout-untracked-symlink' into maint	Junio C Hamano	2011-04-13
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'nm/maint-conflicted-submodule-entries' into maint	Junio C Hamano	2011-04-06
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	pull: do not clobber untracked files on initial pull	Jeff King	2011-04-03
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-rev-list-culled-boundary' into maint	Junio C Hamano	2011-04-03
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mm/maint-log-n-with-diff-filtering' into maint	Junio C Hamano	2011-04-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/format-patch-multiline-header' into maint	Junio C Hamano	2011-04-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'lp/config-vername-check' into maint	Junio C Hamano	2011-04-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|