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

	Commit message (Expand)	Author	Age	Files	Lines
*	Sync with 1.7.9.6	Junio C Hamano	2012-04-02	1	-4/+1
\|\
\| *	merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoedit	Junio C Hamano	2012-03-20	1	-1/+28
\| *	Merge branch 'tr/merge-edit-guidance' into maint	Junio C Hamano	2012-02-27	1	-0/+10
\| \|\
* \| \	Merge branch 'zj/diff-stat-dyncol'	Junio C Hamano	2012-03-06	1	-0/+2
\|\ \ \
\| * \| \|	diff --stat: add config option to limit graph widthzj/diff-stat-dyncol	Zbigniew Jędrzejewski-Szmek	2012-03-01	1	-0/+1
\| * \| \|	merge --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01	1	-0/+1
* \| \| \|	merge: do not trust fstat(2) too much when checking interactiveness	Junio C Hamano	2012-02-23	1	-1/+1
* \| \| \|	Merge branch 'jn/merge-no-edit-fix'	Junio C Hamano	2012-02-12	1	-1/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fix	Junio C Hamano	2012-02-09	1	-3/+7
\| \|/ /
* \| \|	Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'	Junio C Hamano	2012-02-10	1	-1/+2
\|\ \ \ \| \|/ /
\| * \|	merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge	Junio C Hamano	2012-02-05	1	-1/+2
* \| \|	Merge branch 'tr/merge-edit-guidance'	Junio C Hamano	2012-01-31	1	-0/+10
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	merge: add instructions to the commit message when editingtr/merge-edit-guidance	Thomas Rast	2012-01-31	1	-0/+10
\| \|/
* \|	Merge branch 'jc/pull-signed-tag'	Junio C Hamano	2012-01-31	1	-4/+34
\|\ \ \| \|/ \|/\|
\| *	merge: use editor by default in interactive sessions	Junio C Hamano	2012-01-23	1	-4/+34
* \|	Merge branch 'jc/show-sig'	Junio C Hamano	2012-01-06	1	-2/+12
\|\ \
\| * \|	commit: teach --gpg-sign option	Junio C Hamano	2011-11-12	1	-2/+14
\| \|/
* \|	Merge branch 'jk/maint-strbuf-missing-init'	Junio C Hamano	2011-12-22	1	-1/+1
\|\ \
\| * \|	Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init	Junio C Hamano	2011-12-18	1	-1/+1
* \| \|	Merge branch 'nd/war-on-nul-in-commit'	Junio C Hamano	2011-12-22	1	-2/+4
\|\ \ \
\| * \| \|	Convert commit_tree() to take strbuf as message	Nguyễn Thái Ngọc Duy	2011-12-15	1	-2/+2
\| * \| \|	merge: abort if fails to commit	Nguyễn Thái Ngọc Duy	2011-12-15	1	-2/+4
* \| \| \|	Merge branch 'nd/resolve-ref'	Junio C Hamano	2011-12-19	1	-7/+5
\|\ \ \ \
\| * \| \| \|	Convert resolve_ref+xstrdup to new resolve_refdup function	Nguyễn Thái Ngọc Duy	2011-12-13	1	-7/+5
* \| \| \| \|	Merge branch 'nd/ignore-might-be-precious'	Junio C Hamano	2011-12-13	1	-4/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-precious	Nguyễn Thái Ngọc Duy	2011-11-28	1	-4/+8
\| * \| \| \|	Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious	Junio C Hamano	2011-11-28	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'nd/resolve-ref'	Junio C Hamano	2011-12-09	1	-24/+41
\|\ \ \ \ \
\| * \| \| \| \|	Copy resolve_ref() return value for longer use	Nguyễn Thái Ngọc Duy	2011-12-05	1	-22/+40
\| * \| \| \| \|	Convert many resolve_ref() calls to read_ref*() and ref_exists()	Nguyễn Thái Ngọc Duy	2011-11-13	1	-2/+2
* \| \| \| \| \|	Merge branch 'jc/pull-signed-tag'	Junio C Hamano	2011-12-09	1	-45/+50
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	merge: force edit and no-ff mode when merging a tag object	Junio C Hamano	2011-11-09	1	-0/+6
\| * \| \| \| \|	merge: record tag objects without peeling in MERGE_HEAD	Junio C Hamano	2011-11-08	1	-3/+10
\| * \| \| \| \|	merge: make usage of commit->util more extensible	Junio C Hamano	2011-11-08	1	-40/+23
\| * \| \| \| \|	fmt-merge-msg: package options into a structure	Junio C Hamano	2011-11-07	1	-2/+6
\| * \| \| \| \|	merge: notice local merging of tags and keep it unwrapped	Junio C Hamano	2011-11-07	1	-0/+5
\| \|/ / / /
* \| \| \| \|	Merge branch 'jc/request-pull-show-head-4'	Junio C Hamano	2011-12-09	1	-10/+10
\|\ \ \ \ \
\| * \| \| \| \|	fmt-merge-msg: use branch.$name.description	Junio C Hamano	2011-10-07	1	-10/+10
* \| \| \| \| \|	Merge branch 'nd/maint-ignore-exclude'	Junio C Hamano	2011-12-05	1	-1/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude	Nguyễn Thái Ngọc Duy	2011-11-28	1	-1/+1
* \| \| \| \| \|	Merge branch 'vr/git-merge-default-to-upstream'	Junio C Hamano	2011-12-05	1	-3/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	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