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

	Commit message (Expand)	Author	Age
*	Merge branch 'ab/i18n-fixup' into maint	Junio C Hamano	2011-05-31
\|\
\| *	i18n: mark merge CHERRY_PICK_HEAD messages for translation	Ævar Arnfjörð Bjarmason	2011-04-12
\| *	i18n: mark merge "upstream" messages for translation	Ævar Arnfjörð Bjarmason	2011-04-12
\| *	i18n: mark merge "Could not read from" message for translation	Ævar Arnfjörð Bjarmason	2011-04-12
* \|	Merge branch 'jk/cherry-pick-root-with-resolve' into maint	Junio C Hamano	2011-05-26
\|\ \
\| * \|	cherry-pick: handle root commits with external strategies	Jeff King	2011-05-16
\| \|/
* \|	Merge branch 'jc/maint-branch-mergeoptions' into maint	Junio C Hamano	2011-05-16
\|/
*	Merge branch 'jc/merge-sans-branch'	Junio C Hamano	2011-04-01
\|\
\| *	merge: merge with the default upstream branch without argument	Junio C Hamano	2011-03-24
\| *	merge: match the help text with the documentation	Jared Hance	2011-03-24
* \|	Merge branch 'ab/i18n-st'	Junio C Hamano	2011-04-01
\|\ \
\| * \|	i18n: git-merge "Wonderful" message	Ævar Arnfjörð Bjarmason	2011-03-09
\| * \|	i18n: git-merge "Updating %s..%s" message	Ævar Arnfjörð Bjarmason	2011-03-09
\| * \|	i18n: git-merge basic messages	Ævar Arnfjörð Bjarmason	2011-03-09
* \| \|	merge: merge unborn index before setting ref	Jeff King	2011-03-25
* \| \|	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	2011-03-19
\|\ \ \
\| * \| \|	merge: enable progress reporting for rename detection	Jeff King	2011-02-21
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'js/cherry-pick-usability'	Junio C Hamano	2011-03-09
\|\ \ \
\| * \| \|	Introduce CHERRY_PICK_HEAD	Jay Soffian	2011-02-21
\| \|/ /
* \| \|	Merge branch 'mg/placeholders-are-lowercase'	Junio C Hamano	2011-02-27
\|\ \ \
\| * \| \|	Make <identifier> lowercase as per CodingGuidelines	Michael J Gruber	2011-02-15
* \| \| \|	Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'	Junio C Hamano	2011-02-27
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	merge: honor prepare-commit-msg hook	Jay Soffian	2011-02-15
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'maint'	Junio C Hamano	2011-02-15
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	commit,merge,tag: describe -m likewise	Michael J Gruber	2011-02-15
\| \|/
* \|	cherry-pick/revert: add support for -X/--strategy-option	Jonathan Nieder	2010-12-28
\|/
*	Merge branch 'jn/git-cmd-h-bypass-setup'	Junio C Hamano	2010-12-12
\|\
\| *	merge -h: show usage even with corrupt index	Nguyễn Thái Ngọc Duy	2010-10-22
* \|	Merge branch 'jh/notes-merge'	Junio C Hamano	2010-12-08
\|\ \
\| * \|	Provide 'git merge --abort' as a synonym to 'git reset --merge'	Johan Herland	2010-11-17
\| * \|	cmd_merge(): Parse options before checking MERGE_HEAD	Johan Herland	2010-11-17
* \| \|	Merge branch 'cb/maint-orphan-merge-noclobber'	Junio C Hamano	2010-11-24
\|\ \ \
\| * \| \|	do not overwrite untracked during merge from unborn branch	Clemens Buchacher	2010-11-15
\| \|/ /
* \| \|	Change incorrect "remote branch" to "remote tracking branch" in C code	Matthieu Moy	2010-11-03
* \| \|	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-26
\|\ \ \
\| * \| \|	merge-recursive: expose merge options for builtin merge	Jonathan Nieder	2010-08-26
* \| \| \|	Merge branch 'rr/fmt-merge-msg'	Junio C Hamano	2010-09-29
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	merge: Make 'merge.log' an integer or boolean option	Ramkumar Ramachandra	2010-09-09
\| * \| \|	merge: Make '--log' an integer option for number of shortlog entries	Ramkumar Ramachandra	2010-09-09
\| * \| \|	fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len	Ramkumar Ramachandra	2010-09-09
* \| \| \|	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 '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
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	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