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

	Commit message (Expand)	Author	Age
*	Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'	Junio C Hamano	2010-09-15
\|\
\| *	ls-tree $di $dir: do not mistakenly recurse into directories	Junio C Hamano	2010-09-12
\| *	revert: Fix trivial comment style issue	Elijah Newren	2010-09-06
* \|	builtin/fetch.c: comment that branch->remote_name is usable when has_merge	Brandon Casey	2010-09-09
* \|	Merge branch 'jh/error-removing-missing-note'	Junio C Hamano	2010-09-08
\|\ \
\| * \|	notes: Don't create (empty) commit when removing non-existing notes	Johan Herland	2010-08-31
* \| \|	Merge branch 'bc/maint-fetch-url-only'	Junio C Hamano	2010-09-08
\|\ \ \
\| * \| \|	builtin/fetch.c: ignore merge config when not fetching from branch's remote	Brandon Casey	2010-08-25
* \| \| \|	Merge branch 'en/d-f-conflict-fix'	Junio C Hamano	2010-09-08
\|\ \ \ \
\| * \| \| \|	fast-export: ensure that a renamed file is printed after all references	Johannes Sixt	2010-09-08
* \| \| \| \|	Merge branch 'jh/clean-exclude'	Junio C Hamano	2010-09-06
\|\ \ \ \ \
\| * \| \| \| \|	builtin/clean.c: Use STRING_LIST_INIT_NODUP.	Thiago Farina	2010-09-06
* \| \| \| \| \|	Merge branch 'jl/submodule-ignore-diff'	Junio C Hamano	2010-09-04
\|\ \ \ \ \ \
\| * \| \| \| \| \|	checkout: Use submodule.*.ignore settings from .git/config and .gitmodules	Jens Lehmann	2010-08-30
\| * \| \| \| \| \|	checkout: respect diff.ignoreSubmodules setting	Johannes Schindelin	2010-08-25
* \| \| \| \| \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-09-03
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	Matthieu Moy	2010-09-03
\| * \| \| \| \| \| \|	setup_unpack_trees_porcelain: take the whole options struct as parameter	Matthieu Moy	2010-09-03
\| * \| \| \| \| \| \|	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy	2010-09-03
* \| \| \| \| \| \| \|	Merge branch 'nd/clone-depth-zero'	Junio C Hamano	2010-09-03
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	clone: warn users --depth is ignored in local clones	Nguyễn Thái Ngọc Duy	2010-08-24
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	merge: let custom strategies intervene in trivial merges	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
\| * \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	merge-recursive --renormalize	Jonathan Nieder	2010-08-06
\| * \| \| \| \| \| \| \| \| \|	rerere: migrate to parse-options API	Jonathan Nieder	2010-08-06
\| * \| \| \| \| \| \| \| \| \|	ll-merge: let caller decide whether to renormalize	Jonathan Nieder	2010-08-06
\| * \| \| \| \| \| \| \| \| \|	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	2010-07-02
* \| \| \| \| \| \| \| \| \| \|	Sync with 1.7.2.3	Junio C Hamano	2010-09-03
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	builtin/merge_recursive.c: Add an usage string and make use of it.	Thiago Farina	2010-09-03
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'sg/rerere-gc-old-still-used' into maint	Junio C Hamano	2010-09-01
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'dj/fetch-tagopt' into maint	Junio C Hamano	2010-09-01
\| \|\ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jn/cherry-revert-message-clean-up'	Junio C Hamano	2010-08-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	cherry-pick/revert: Use advise() for hints	Jonathan Nieder	2010-08-15
\| * \| \| \| \| \| \| \| \| \| \| \| \|	cherry-pick/revert: Use error() for failure message	Jonathan Nieder	2010-08-15
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Introduce advise() to print hints	Jonathan Nieder	2010-08-15
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate “Finished cherry-pick/revert” message	Jonathan Nieder	2010-08-15
\| * \| \| \| \| \| \| \| \| \| \| \| \|	revert: improve success message by adding abbreviated commit sha1	Christian Couder	2010-07-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	revert: don't print "Finished one cherry-pick." if commit failed	Christian Couder	2010-07-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	revert: refactor commit code into a new run_git_commit() function	Christian Couder	2010-07-16
\| * \| \| \| \| \| \| \| \| \| \| \| \|	revert: report success when using option --strategy	Christian Couder	2010-07-16
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'	Junio C Hamano	2010-08-31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \