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

	Commit message (Expand)	Author	Age	Files	Lines
*	Update draft release notes to 1.8.2.2	Junio C Hamano	2013-04-24	1	-0/+18
*	Merge branch 'jk/diff-algo-finishing-touches' into maint	Junio C Hamano	2013-04-24	2	-2/+9
\|\
\| *	diff: allow unstuck arguments with --diff-algorithm	John Keeping	2013-04-05	1	-2/+3
\| *	git-merge(1): document diff-algorithm option to merge-recursive	John Keeping	2013-04-05	1	-0/+6
* \|	Merge branch 'sr/log-SG-no-textconv' into maint	Junio C Hamano	2013-04-24	2	-72/+86
\|\ \
\| * \|	diffcore-pickaxe: unify code for log -S/-G	Jeff King	2013-04-05	1	-69/+49
\| * \|	diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"	Junio C Hamano	2013-04-05	1	-5/+7
\| * \|	diffcore-pickaxe: port optimization from has_changes() to diff_grep()	Junio C Hamano	2013-04-05	1	-1/+6
\| * \|	diffcore-pickaxe: respect --no-textconv	Simon Ruderich	2013-04-05	2	-4/+36
\| * \|	diffcore-pickaxe: remove fill_one()	Jeff King	2013-04-04	1	-20/+10
\| * \|	diffcore-pickaxe: remove unnecessary call to get_textconv()	Simon Ruderich	2013-04-04	1	-9/+14
* \| \|	Merge branch 'jc/merge-tag-object' into maint	Junio C Hamano	2013-04-24	2	-32/+81
\|\ \ \
\| * \| \|	t6200: test message for merging of an annotated tag	Junio C Hamano	2013-04-01	1	-0/+39
\| * \| \|	t6200: use test_config/test_unconfig	Junio C Hamano	2013-04-01	1	-32/+29
\| * \| \|	merge: a random object may not necssarily be a commit	Junio C Hamano	2013-03-19	1	-0/+13
* \| \| \|	completion: remove duplicate block for "git commit -c"	Mårten Kongstad	2013-04-24	1	-7/+0
* \| \| \|	cherry-pick/revert: make usage say '<commit-ish>...'	Kevin Bracey	2013-04-24	1	-2/+2
* \| \| \|	Start preparing for 1.8.2.2	Junio C Hamano	2013-04-22	2	-1/+26
* \| \| \|	Merge branch 'ta/glossary' into maint	Junio C Hamano	2013-04-22	32	-111/+89
\|\ \ \ \
\| * \| \| \|	glossary: improve definitions of refspec and pathspec	Thomas Ackermann	2013-04-15	1	-23/+10
\| * \| \| \|	The name of the hash function is "SHA-1", not "SHA1"	Thomas Ackermann	2013-04-15	31	-68/+68
\| * \| \| \|	glossary: improve description of SHA-1 related topics	Thomas Ackermann	2013-04-15	1	-10/+10
\| * \| \| \|	glossary: remove outdated/misleading/irrelevant entries	Thomas Ackermann	2013-04-15	1	-10/+1
* \| \| \| \|	Merge branch 'jk/doc-http-backend' into maint	Junio C Hamano	2013-04-22	3	-1/+129
\|\ \ \ \ \
\| * \| \| \| \|	doc/http-backend: match query-string in apache half-auth example	Jeff King	2013-04-13	3	-8/+72
\| * \| \| \| \|	doc/http-backend: give some lighttpd config examples	Jeff King	2013-04-11	1	-0/+55
\| * \| \| \| \|	doc/http-backend: clarify "half-auth" repo configuration	Jeff King	2013-04-11	1	-0/+9
* \| \| \| \| \|	Merge branch 'jk/test-trash' into maint	Junio C Hamano	2013-04-22	1	-9/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	t/test-lib.sh: drop "$test" variable	Jeff King	2013-04-14	1	-5/+5
\| * \| \| \| \| \|	t/test-lib.sh: fix TRASH_DIRECTORY handling	John Keeping	2013-04-14	1	-4/+4
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jk/daemon-user-doc' into maint	Junio C Hamano	2013-04-22	1	-0/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	doc: clarify that "git daemon --user=<user>" option does not export HOME=~user	Junio C Hamano	2013-04-12	1	-0/+7
* \| \| \| \| \| \|	Merge branch 'jc/detached-head-doc' into maint	Junio C Hamano	2013-04-22	1	-3/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	glossary: extend "detached HEAD" description	Junio C Hamano	2013-04-05	1	-3/+16
* \| \| \| \| \| \| \|	Merge branch 'jk/show-branch-strbuf' into maint	Junio C Hamano	2013-04-22	1	-9/+8
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	show-branch: use strbuf instead of static buffer	Jeff King	2013-04-06	1	-9/+8
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'js/rerere-forget-protect-against-NUL' into maint	Junio C Hamano	2013-04-22	2	-10/+36
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rerere forget: do not segfault if not all stages are present	Johannes Sixt	2013-04-04	2	-8/+20
\| * \| \| \| \| \| \| \|	rerere forget: grok files containing NUL	Johannes Sixt	2013-04-02	2	-2/+16
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint	Junio C Hamano	2013-04-22	4	-7/+41
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	test: resurrect q_to_tab	Junio C Hamano	2013-03-29	1	-0/+4
\| * \| \| \| \| \| \| \|	apply --whitespace=fix: avoid running over the postimage buffer	Junio C Hamano	2013-03-22	4	-9/+39
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ap/combine-diff-ignore-whitespace' into maint	Junio C Hamano	2013-04-22	2	-7/+161
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Allow combined diff to ignore white-spaces	Antoine Pelisse	2013-03-14	2	-7/+161
* \| \| \| \| \| \| \| \|	Merge branch 'jk/suppress-clang-warning' into maint	Junio C Hamano	2013-04-22	2	-2/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fix clang -Wtautological-compare with unsigned enum	Antoine Pelisse	2013-02-25	2	-2/+4
* \| \| \| \| \| \| \| \| \|	Merge branch 'tr/perl-keep-stderr-open' into maint	Junio C Hamano	2013-04-22	2	-4/+5
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	t9700: do not close STDERR	Thomas Rast	2013-04-04	1	-1/+2
\| * \| \| \| \| \| \| \| \| \|	perl: redirect stderr to /dev/null instead of closing	Thomas Rast	2013-04-04	1	-3/+3
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'lf/bundle-with-tip-wo-message' into maint	Junio C Hamano	2013-04-22	2	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \