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

	Commit message (Expand)	Author	Age
*	Merge branch 'sb/fmt-merge-msg'	Junio C Hamano	2010-04-06
\|\
\| *	t6200: test fmt-merge-msg more	Stephen Boyd	2010-03-24
\| *	t6200: modernize with test_tick	Stephen Boyd	2010-03-24
\| *	fmt-merge-msg: be quiet if nothing to merge	Stephen Boyd	2010-03-24
* \|	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	2010-04-06
\|\ \
\| * \|	diff --check: honor conflict-marker-size attribute	Junio C Hamano	2010-03-24
* \| \|	Merge branch 'ef/maint-empty-commit-log'	Junio C Hamano	2010-04-06
\|\ \ \
\| * \| \|	rev-list: fix --pretty=oneline with empty message	Erik Faye-Lund	2010-03-21
* \| \| \|	Merge branch 'mb/rebase-i-no-ff'	Junio C Hamano	2010-04-03
\|\ \ \ \
\| * \| \| \|	Teach rebase the --no-ff option.	Marc Branchaud	2010-03-24
* \| \| \| \|	Merge branch 'jn/merge-diff3-label'	Junio C Hamano	2010-04-03
\|\ \ \ \ \
\| * \| \| \| \|	cherry-pick, revert: add a label for ancestor	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	revert: clarify label on conflict hunks	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	checkout -m --conflict=diff3: add a label for ancestor	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	checkout --conflict=diff3: add a label for ancestor	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	merge-file --diff3: add a label for ancestor	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	tests: document cherry-pick behavior in face of conflicts	Jonathan Nieder	2010-03-20
\| * \| \| \| \|	tests: document format of conflicts from checkout -m	Jonathan Nieder	2010-03-20
* \| \| \| \| \|	Merge branch 'bc/t5505-fix'	Junio C Hamano	2010-04-03
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t/t5505-remote.sh: escape * to prevent interpretation by shell as glob	Brandon Casey	2010-03-20
\| * \| \| \| \| \|	t5505: add missing &&	Brandon Casey	2010-03-20
\| * \| \| \| \| \|	t5505: remove unnecessary subshell invocations	Brandon Casey	2010-03-20
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'bc/acl-test'	Junio C Hamano	2010-04-03
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t/t1304: make a second colon optional in the mask ACL check	Brandon Casey	2010-03-16
\| * \| \| \| \| \|	t/t1304: set the ACL effective rights mask	Brandon Casey	2010-03-16
\| * \| \| \| \| \|	t/t1304: use 'test -r' to test readability rather than looking at mode bits	Brandon Casey	2010-03-16
\| * \| \| \| \| \|	t/t1304: set the Default ACL base entries	Brandon Casey	2010-03-16
\| * \| \| \| \| \|	t/t1304: avoid -d option to setfacl	Brandon Casey	2010-03-16
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'do/rebase-i-arbitrary'	Junio C Hamano	2010-04-03
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rebase--interactive: don't require what's rebased to be a branch	Dave Olszewski	2010-03-14
* \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-03-29
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	format-patch: Squelch 'fatal: Not a range." error	Kevin Ballard	2010-03-29
\| * \| \| \| \| \| \|	Merge branch 'cp/add-u-pathspec' into maint	Junio C Hamano	2010-03-28
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	Merge branch 'cc/cherry-pick-ff'	Junio C Hamano	2010-03-28
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	cherry-pick: add tests for new --ff option	Christian Couder	2010-03-06
* \| \| \| \| \| \| \| \| \|	Merge branch 'sb/notes-parse-opt'	Junio C Hamano	2010-03-28
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	notes: rework subcommands and parse options	Stephen Boyd	2010-03-12
* \| \| \| \| \| \| \| \| \| \|	rebase -i: make post-rewrite work for 'edit'	Thomas Rast	2010-03-28
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-03-28
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	t9350: fix careless use of "cd"	Junio C Hamano	2010-03-28
\| * \| \| \| \| \| \| \| \|	difftool: Fix '--gui' when diff.guitool is unconfigured	David Aguilar	2010-03-28
\| * \| \| \| \| \| \| \| \|	Merge branch 'jc/color-attrs' into maint	Junio C Hamano	2010-03-24
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'jk/maint-add-ignored-dir' into maint	Junio C Hamano	2010-03-24
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'bg/apply-fix-blank-at-eof' into maint	Junio C Hamano	2010-03-24
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'tr/notes-display'	Junio C Hamano	2010-03-24
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	commit --amend: copy notes to the new commit	Thomas Rast	2010-03-12
\| * \| \| \| \| \| \| \| \| \| \|	rebase: support automatic notes copying	Thomas Rast	2010-03-12
\| * \| \| \| \| \| \| \| \| \| \|	notes: implement helpers needed for note copying during rewrite	Thomas Rast	2010-03-12
\| * \| \| \| \| \| \| \| \| \| \|	notes: implement 'git notes copy --stdin'	Thomas Rast	2010-03-12
\| * \| \| \| \| \| \| \| \| \| \|	rebase -i: invoke post-rewrite hook	Thomas Rast	2010-03-12