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

	Commit message (Expand)	Author	Age
*	Merge branch 'ab/compat-regex'	Junio C Hamano	2010-09-03
\|\
\| *	t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND	Ævar Arnfjörð Bjarmason	2010-08-19
* \|	Merge branch 'jn/apply-filename-with-sp'	Junio C Hamano	2010-09-03
\|\ \
\| * \|	apply: handle traditional patches with space in filename	Jonathan Nieder	2010-08-21
\| * \|	tests: exercise "git apply" with weird filenames	Jonathan Nieder	2010-08-21
\| * \|	apply: split quoted filename handling into new function	Jonathan Nieder	2010-08-21
\| \|/
* \|	Merge branch 'jn/merge-custom-no-trivial'	Junio C Hamano	2010-09-03
\|\ \
\| * \|	t7606: Avoid using head as a file name	Brian Gernhardt	2010-08-24
\| * \|	merge: let custom strategies intervene in trivial merges	Jonathan Nieder	2010-08-15
\| * \|	t7606 (merge-theirs): modernize style	Jonathan Nieder	2010-08-15
\| \|/
* \|	Merge branch 'jn/update-contrib-example-merge'	Junio C Hamano	2010-09-03
\|\ \
\| * \|	fmt-merge-msg -m to override merge title	Jonathan Nieder	2010-08-18
\| * \|	merge-base --independent to print reduced parent list in a merge	Jonathan Nieder	2010-08-18
\| * \|	merge-base --octopus to mimic show-branch --merge-base	Jonathan Nieder	2010-08-18
\| * \|	t6200 (fmt-merge-msg): style nitpicks	Jonathan Nieder	2010-08-18
\| * \|	t6010 (merge-base): modernize style	Jonathan Nieder	2010-08-18
\| * \|	t7600 (merge): test merge from branch yet to be born	Jonathan Nieder	2010-08-18
\| * \|	t7600 (merge): check reflog entry	Jonathan Nieder	2010-08-18
\| * \|	t7600 (merge): do not launch gitk for --debug	Jonathan Nieder	2010-08-18
\| * \|	t7600 (merge): modernize style	Jonathan Nieder	2010-08-18
\| * \|	merge: do not mistake (ancestor of) tag for branch	Jonathan Nieder	2010-08-18
\| \|/
* \|	Merge branch 'jn/merge-renormalize'	Junio C Hamano	2010-09-03
\|\ \
\| * \|	rerere: migrate to parse-options API	Jonathan Nieder	2010-08-06
\| * \|	t4200 (rerere): modernize style	Jonathan Nieder	2010-08-06
\| * \|	t6038 (merge.renormalize): check that it can be turned off	Jonathan Nieder	2010-08-06
\| * \|	t6038 (merge.renormalize): try checkout -m and cherry-pick	Jonathan Nieder	2010-08-06
\| * \|	t6038 (merge.renormalize): style nitpicks	Jonathan Nieder	2010-08-06
\| * \|	Try normalizing files to avoid delete/modify conflicts when merging	Eyvind Bernhardsen	2010-07-02
\| * \|	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	2010-07-02
* \| \|	t7406 & t7407: add missing && at end of lines	Jens Lehmann	2010-09-03
* \| \|	t7405: cd inside subshell instead of around	Jens Lehmann	2010-09-03
* \| \|	Merge branch 'da/fix-submodule-sync-superproject-config'	Junio C Hamano	2010-08-31
\|\ \ \
\| * \| \|	submodule sync: Update "submodule.<name>.url"	David Aguilar	2010-08-18
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'jn/cherry-revert-message-clean-up'	Junio C Hamano	2010-08-31
\|\ \ \
\| * \| \|	tests: fix syntax error in "Use advise() for hints" test	Ævar Arnfjörð Bjarmason	2010-08-18
\| * \| \|	cherry-pick/revert: Use advise() for hints	Jonathan Nieder	2010-08-15
\| * \| \|	Eliminate “Finished cherry-pick/revert” message	Jonathan Nieder	2010-08-15
\| * \| \|	t3508: add check_head_differs_from() helper function and use it	Christian Couder	2010-07-23
\| * \| \|	revert: improve success message by adding abbreviated commit sha1	Christian Couder	2010-07-16
\| * \| \|	revert: report success when using option --strategy	Christian Couder	2010-07-16
* \| \| \|	Merge branch 'dj/fetch-tagopt'	Junio C Hamano	2010-08-31
\|\ \ \ \
\| * \| \| \|	fetch: allow command line --tags to override config	Daniel Johnson	2010-08-14
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'en/d-f-conflict-fix'	Junio C Hamano	2010-08-31
\|\ \ \ \
\| * \| \| \|	merge-recursive: Fix multiple file rename across D/F conflict	Elijah Newren	2010-08-18
\| * \| \| \|	t6031: Add a testcase covering multiple renames across a D/F conflict	Elijah Newren	2010-08-18
\| * \| \| \|	Mark tests that use symlinks as needing SYMLINKS prerequisite	Elijah Newren	2010-08-12
\| * \| \| \|	t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test	Ævar Arnfjörð Bjarmason	2010-07-27
\| * \| \| \|	fast-export: Fix output order of D/F changes	Elijah Newren	2010-07-09
\| * \| \| \|	merge_recursive: Fix renames across paths below D/F conflicts	Elijah Newren	2010-07-09
\| * \| \| \|	merge-recursive: Fix D/F conflicts	Elijah Newren	2010-07-09