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

	Commit message (Expand)	Author	Age	Files	Lines
*	mergetool: Provide an empty file when neededda/maint-mergetool-twoway	David Aguilar	2012-01-23	2	-5/+35
*	Merge branch 'jm/mergetool-pathspec'	Junio C Hamano	2011-10-10	3	-70/+71
\|\
\| *	mergetool: no longer need to save standard input	Junio C Hamano	2011-09-26	1	-6/+4
\| *	mergetool: Use args as pathspec to unmerged files	Jonathon Mah	2011-09-26	3	-69/+72
* \|	Merge branch 'jc/maint-diffstat-numstat-context'	Junio C Hamano	2011-10-10	1	-0/+2
\|\ \
\| * \|	diff: teach --stat/--numstat to honor -U$num	Junio C Hamano	2011-09-22	1	-0/+2
* \| \|	Merge branch 'mz/remote-rename'	Junio C Hamano	2011-10-10	2	-7/+52
\|\ \ \
\| * \| \|	remote: only update remote-tracking branch if updating refspec	Martin von Zweigbergk	2011-09-11	2	-4/+9
\| * \| \|	remote rename: warn when refspec was not updated	Martin von Zweigbergk	2011-09-11	1	-0/+6
\| * \| \|	remote: "rename o foo" should not rename ref "origin/bar"	Martin von Zweigbergk	2011-09-11	2	-1/+11
\| * \| \|	remote: write correct fetch spec when renaming remote 'remote'	Martin von Zweigbergk	2011-09-11	2	-4/+28
* \| \| \|	Merge branch 'cb/common-prefix-unification'	Junio C Hamano	2011-10-10	6	-64/+40
\|\ \ \ \
\| * \| \| \|	rename pathspec_prefix() to common_prefix() and move to dir.[ch]	Clemens Buchacher	2011-09-12	6	-12/+15
\| * \| \| \|	consolidate pathspec_prefix and common_prefix	Junio C Hamano	2011-09-06	3	-56/+28
\| * \| \| \|	remove prefix argument from pathspec_prefix	Clemens Buchacher	2011-09-06	4	-6/+7
* \| \| \| \|	Merge branch 'jn/maint-http-error-message'	Junio C Hamano	2011-10-10	1	-2/+7
\|\ \ \ \ \
\| * \| \| \| \|	http: avoid empty error messages for some curl errors	Jonathan Nieder	2011-09-06	1	-1/+6
\| * \| \| \| \|	http: remove extra newline in error message	Jonathan Nieder	2011-09-06	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'hv/submodule-update-none'	Junio C Hamano	2011-10-10	2	-1/+69
\|\ \ \ \ \
\| * \| \| \| \|	add update 'none' flag to disable update of submodule by default	Heiko Voigt	2011-08-11	3	-1/+78
\| * \| \| \| \|	submodule: move update configuration variable further up	Heiko Voigt	2011-08-11	1	-6/+7
* \| \| \| \| \|	Merge branch 'fg/submodule-git-file-git-dir'	Junio C Hamano	2011-10-10	10	-67/+244
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move git-dir for submodulesfg/submodule-git-file-git-dir	Fredrik Gustafsson	2011-08-22	3	-7/+149
\| * \| \| \| \| \|	rev-parse: add option --resolve-git-dir <path>	Fredrik Gustafsson	2011-08-16	7	-54/+78
* \| \| \| \| \| \|	Fix some "variable might be used uninitialized" warnings	Ramsay Jones	2011-10-09	2	-2/+2
* \| \| \| \| \| \|	Makefile: fix permissions of mergetools/ checked out with permissive umask	Junio C Hamano	2011-10-09	1	-2/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Makefile: fix permissions of mergetools/ checked out with permissive umask	Jonathan Nieder	2011-10-09	1	-2/+1
* \| \| \| \| \| \| \|	Post 1.7.7 first wave	Junio C Hamano	2011-10-05	3	-2/+109
* \| \| \| \| \| \| \|	Merge branch 'mm/mediawiki-as-a-remote'	Junio C Hamano	2011-10-05	2	-0/+830
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	git-remote-mediawiki: allow a domain to be set for authentication	Matthieu Moy	2011-09-28	1	-0/+3
\| * \| \| \| \| \| \| \|	git-remote-mediawiki: obey advice.pushNonFastForward	Matthieu Moy	2011-09-27	1	-7/+10
\| * \| \| \| \| \| \| \|	git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts	Matthieu Moy	2011-09-27	1	-6/+37
\| * \| \| \| \| \| \| \|	git-remote-mediawiki: trivial fixes	Matthieu Moy	2011-09-27	1	-2/+1
\| * \| \| \| \| \| \| \|	git-remote-mediawiki: allow push to set MediaWiki metadata	Matthieu Moy	2011-09-01	1	-2/+33
\| * \| \| \| \| \| \| \|	Add a remote helper to interact with mediawiki (fetch & push)	Jeremie Nikaes	2011-09-01	2	-0/+763
* \| \| \| \| \| \| \| \|	Merge branch 'js/check-attr-cached'	Junio C Hamano	2011-10-05	3	-47/+48
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	t0003: remove extra whitespaces	Junio C Hamano	2011-09-22	1	-46/+22
\| * \| \| \| \| \| \| \| \|	Teach '--cached' option to check-attr	Jay Soffian	2011-09-22	3	-4/+29
* \| \| \| \| \| \| \| \| \|	Merge branch 'rj/maint-t9159-svn-rev-notation'	Junio C Hamano	2011-10-05	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	t9159-*.sh: skip for mergeinfo test for svn <= 1.4	Ramsay Jones	2011-09-21	1	-0/+8
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'cn/eradicate-working-copy'	Junio C Hamano	2011-10-05	4	-6/+6
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove 'working copy' from the documentation and C code	Carlos Martín Nieto	2011-09-21	4	-6/+6
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jn/gitweb-highlite-sanitise'	Junio C Hamano	2011-10-05	1	-1/+13
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	gitweb: Strip non-printable characters from syntax highlighter output	Jakub Narebski	2011-09-16	1	-1/+13
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/ls-remote-short-help'	Junio C Hamano	2011-10-05	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	ls-remote: a lone "-h" is asking for helpjc/ls-remote-short-help	Junio C Hamano	2011-09-16	1	-0/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sn/doc-update-index-assume-unchanged'	Junio C Hamano	2011-10-05	1	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Documentation/git-update-index: refer to 'ls-files'	Stefan Naewe	2011-09-21	1	-2/+5
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg/maint-doc-sparse-checkout'	Junio C Hamano	2011-10-05	4	-25/+31
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	git-read-tree.txt: correct sparse-checkout and skip-worktree description	Michael J Gruber	2011-09-21	1	-4/+4