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

	Commit message (Expand)	Author	Age
*	Sync with 1.7.9.6	Junio C Hamano	2012-04-02
\|\
\| *	Merge branch 'jc/maint-merge-autoedit' into maint	Junio C Hamano	2012-04-02
\| \|\
\| \| *	merge: backport GIT_MERGE_AUTOEDIT support	Junio C Hamano	2012-03-20
\| * \|	Merge branch 'maint-1.7.8' into maint	Junio C Hamano	2012-03-20
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Merge branch 'jc/advise-i18n' into maint-1.7.8	Junio C Hamano	2012-03-20
\| \| \|\
* \| \| \|	config: remove useless assignment	René Scharfe	2012-03-28
* \| \| \|	Merge branch 'az/verify-tag-use-gpg-config'	Junio C Hamano	2012-03-12
\|\ \ \ \
\| * \| \| \|	verify-tag: Parse GPG configuration options.	Alex Zepeda	2012-03-08
* \| \| \| \|	Merge branch 'kb/maint-prune-rmdir-closedir'	Junio C Hamano	2012-03-08
\|\ \ \ \ \
\| * \| \| \| \|	fix deletion of .git/objects sub-directories in git-prune/repack	Karsten Blees	2012-03-07
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'cn/maint-branch-with-bad' into maint	Junio C Hamano	2012-03-04
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'nd/maint-verify-objects' into maint	Junio C Hamano	2012-03-04
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'pj/remote-set-branches-usage-fix' into maint	Junio C Hamano	2012-02-27
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'tr/merge-edit-guidance' into maint	Junio C Hamano	2012-02-27
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'cb/receive-pack-keep-errors' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'cb/transfer-no-progress' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'jk/git-dir-lookup' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'cb/maint-rev-list-verify-object' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/grep-binary-attribute' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'nd/diffstat-gramnum' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/checkout-out-of-unborn' into maint	Junio C Hamano	2012-02-16
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jx/i18n-more-marking' into maint	Junio C Hamano	2012-02-16
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/maint-tag-show-fixes' into maint	Junio C Hamano	2012-02-13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jn/merge-no-edit-fix' into maint	Junio C Hamano	2012-02-13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'zj/diff-stat-dyncol'	Junio C Hamano	2012-03-06
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	diff --stat: add config option to limit graph width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	log --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	diff --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/symbolic-ref-short'	Junio C Hamano	2012-03-04
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	symbolic-ref --short: abbreviate the output unambiguously	Jan Krüger	2012-02-27
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cb/fsck-squelch-dangling'	Junio C Hamano	2012-03-01
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fsck: --no-dangling omits "dangling object" information	Junio C Hamano	2012-02-28
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs/no-no-no-parseopt'	Junio C Hamano	2012-03-01
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	parse-options: remove PARSE_OPT_NEGHELP	René Scharfe	2012-02-28
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'nd/maint-verify-objects'	Junio C Hamano	2012-03-01
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rev-list: fix --verify-objects --quiet becoming --objects	Nguyễn Thái Ngọc Duy	2012-02-28
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rev-list: remove BISECT_SHOW_TRIED flag	Nguyễn Thái Ngọc Duy	2012-02-28
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cn/maint-branch-with-bad'	Junio C Hamano	2012-03-01
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| / / / / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branch: don't assume the merge filter ref exists	Carlos Martín Nieto	2012-02-27
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fc/push-prune'	Junio C Hamano	2012-02-26
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	push: add '--prune' option	Felipe Contreras	2012-02-22
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pack-objects: Fix compilation with NO_PTHREDS	Michał Kiedrowicz	2012-02-26
\| \|_\|_\|_\|/ / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jk/config-include'	Junio C Hamano	2012-02-23
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config: add include directive	Jeff King	2012-02-17
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config: stop using config_exclusive_filename	Jeff King	2012-02-17
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config: copy the return value of prefix_filename	Jeff King	2012-02-17
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pj/remote-set-branches-usage-fix'	Junio C Hamano	2012-02-23
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remote: fix set-branches usage and documentation	Philip Jägenstedt	2012-02-19