delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstream	Vincent van Ravesteijn	2011-11-21	1	-3/+6
\| * \| \| \| \|	Merge branch 'nd/maint-autofix-tag-in-head' into maint	Junio C Hamano	2011-10-21	1	-56/+61
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	do not let git_path clobber errno when reporting errorsjn/git-path-errno	Jonathan Nieder	2011-11-17	1	-20/+29
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'js/merge-edit-option'	Junio C Hamano	2011-10-19	1	-39/+70
\|\ \ \ \ \
\| * \| \| \| \|	Teach merge the '[-e\|--edit]' option	Jay Soffian	2011-10-12	1	-39/+70
\| \|/ / / /
* \| \| \| \|	Merge branch 'nd/maint-autofix-tag-in-head'	Junio C Hamano	2011-10-13	1	-56/+61
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Accept tags in HEAD or MERGE_HEAD	Nguyễn Thái Ngọc Duy	2011-09-18	1	-5/+2
\| * \| \| \|	merge: remove global variable head[]	Nguyễn Thái Ngọc Duy	2011-09-18	1	-44/+53
\| * \| \| \|	merge: use return value of resolve_ref() to determine if HEAD is invalid	Nguyễn Thái Ngọc Duy	2011-09-18	1	-1/+1
\| * \| \| \|	merge: keep stash[] a local variable	Nguyễn Thái Ngọc Duy	2011-08-26	1	-17/+16
* \| \| \| \|	Merge branch 'jc/want-commit'	Junio C Hamano	2011-10-05	1	-5/+14
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Allow git merge ":/<pattern>"jc/want-commit	Junio C Hamano	2011-09-15	1	-5/+14
\| \|/ / /
* \| \| \|	Merge branch 'jk/color-and-pager'	Junio C Hamano	2011-08-28	1	-6/+0
\|\ \ \ \
\| * \| \| \|	want_color: automatically fallback to color.ui	Jeff King	2011-08-19	1	-4/+0
\| * \| \| \|	diff: refactor COLOR_DIFF from a flag into an int	Jeff King	2011-08-18	1	-2/+0
\| \|/ / /
* \| \| \|	Merge branch 'jc/merge-reword'	Junio C Hamano	2011-08-25	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	merge: reword the final message	Junio C Hamano	2011-05-25	1	-1/+1
* \| \| \|	Merge branch 'jk/format-patch-am'	Junio C Hamano	2011-05-31	1	-1/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	clean up calling conventions for pretty.c functions	Jeff King	2011-05-26	1	-1/+2
* \| \| \|	Merge branch 'jk/cherry-pick-root-with-resolve'	Junio C Hamano	2011-05-19	1	-2/+10
\|\ \ \ \
\| * \| \| \|	cherry-pick: handle root commits with external strategies	Jeff King	2011-05-16	1	-2/+10
* \| \| \| \|	Merge branch 'mg/merge-ff-config'	Junio C Hamano	2011-05-16	1	-0/+9
\|\ \ \ \ \
\| * \| \| \| \|	merge: introduce merge.ff configuration variable	Junio C Hamano	2011-05-06	1	-0/+9
\| * \| \| \| \|	Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config	Junio C Hamano	2011-05-06	1	-15/+26
\| \|/ / / /
* \| \| \| \|	Merge branch 'jc/maint-branch-mergeoptions'	Junio C Hamano	2011-05-11	1	-15/+26
* \| \| \| \|	Merge branch 'ab/i18n-fixup'	Junio C Hamano	2011-05-02	1	-8/+8
\|\ \ \ \ \
\| * \| \| \| \|	i18n: mark merge CHERRY_PICK_HEAD messages for translation	Ævar Arnfjörð Bjarmason	2011-04-12	1	-3/+3
\| * \| \| \| \|	i18n: mark merge "upstream" messages for translation	Ævar Arnfjörð Bjarmason	2011-04-12	1	-4/+4
\| * \| \| \| \|	i18n: mark merge "Could not read from" message for translation	Ævar Arnfjörð Bjarmason	2011-04-12	1	-1/+1
\| \|/ / / /
* \| \| \| \|	merge: allow "-" as a short-hand for "previous branch"	Junio C Hamano	2011-04-07	1	-3/+6
\|/ / / /
* \| \| \|	Merge branch 'jc/merge-sans-branch'	Junio C Hamano	2011-04-01	1	-2/+40
\|\ \ \ \
\| * \| \| \|	merge: merge with the default upstream branch without argument	Junio C Hamano	2011-03-24	1	-1/+38
\| * \| \| \|	merge: match the help text with the documentation	Jared Hance	2011-03-24	1	-2/+3
\| \|/ / /
* \| \| \|	Merge branch 'ab/i18n-st'	Junio C Hamano	2011-04-01	1	-64/+64
\|\ \ \ \
\| * \| \| \|	i18n: git-merge "Wonderful" message	Ævar Arnfjörð Bjarmason	2011-03-09	1	-1/+1
\| * \| \| \|	i18n: git-merge "Updating %s..%s" message	Ævar Arnfjörð Bjarmason	2011-03-09	1	-1/+1
\| * \| \| \|	i18n: git-merge basic messages	Ævar Arnfjörð Bjarmason	2011-03-09	1	-62/+62
* \| \| \| \|	merge: merge unborn index before setting ref	Jeff King	2011-03-25	1	-1/+1
* \| \| \| \|	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	2011-03-19	1	-0/+7
\|\ \ \ \ \
\| * \| \| \| \|	merge: enable progress reporting for rename detection	Jeff King	2011-02-21	1	-0/+7
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'js/cherry-pick-usability'	Junio C Hamano	2011-03-09	1	-0/+7
\|\ \ \ \ \
\| * \| \| \| \|	Introduce CHERRY_PICK_HEAD	Jay Soffian	2011-02-21	1	-0/+7
\| \|/ / / /
* \| \| \| \|	Merge branch 'mg/placeholders-are-lowercase'	Junio C Hamano	2011-02-27	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Make <identifier> lowercase as per CodingGuidelines	Michael J Gruber	2011-02-15	1	-1/+1
* \| \| \| \| \|	Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'	Junio C Hamano	2011-02-27	1	-8/+29
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	merge: honor prepare-commit-msg hook	Jay Soffian	2011-02-15	1	-8/+29
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2011-02-15	1	-2/+2
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	commit,merge,tag: describe -m likewise	Michael J Gruber	2011-02-15	1	-2/+2
\| \|/ / /
* \| \| \|	cherry-pick/revert: add support for -X/--strategy-option	Jonathan Nieder	2010-12-28	1	-2/+4
\|/ / /
* \| \|	Merge branch 'jn/git-cmd-h-bypass-setup'	Junio C Hamano	2010-12-12	1	-0/+3
\|\ \ \