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

	Commit message (Expand)	Author	Age
*	Teach git-pull to pass -X<option> to git-merge	Avery Pennarun	2010-01-17
*	git merge -X<option>	Avery Pennarun	2010-01-17
*	git-merge-file --ours, --theirs	Junio C Hamano	2009-11-29
*	Merge remote branch 'ko/master' into HEAD	Junio C Hamano	2009-11-29
\|\
\| *	Update draft release notes to 1.6.6 before merging topics for -rc1	Junio C Hamano	2009-11-28
\| *	Makefile: do not clean arm directory	Jonathan Nieder	2009-11-28
\| *	Merge branch 'maint'	Junio C Hamano	2009-11-27
\| \|\
\| \| *	builtin-apply.c: pay attention to -p<n> when determining the name	Junio C Hamano	2009-11-26
\| * \|	Add a notice that only certain functions can print color escape codes	Johannes Sixt	2009-11-27
\| * \|	gitworkflows: Consistently back-quote git commands	Björn Gustavsson	2009-11-26
\| * \|	Merge branch 'rs/work-around-grep-opt-insanity'	Junio C Hamano	2009-11-25
\| \|\ \
\| \| * \|	Protect scripted Porcelains from GREP_OPTIONS insanity	Junio C Hamano	2009-11-23
\| \| * \|	mergetool--lib: simplify guess_merge_tool()	René Scharfe	2009-11-23
\| * \| \|	Explicitly truncate bswap operand to uint32_t	Benjamin Kramer	2009-11-25
\| * \| \|	t1200: fix a timing dependent error	Nanako Shiraishi	2009-11-25
\| * \| \|	Merge branch 'rj/maint-cygwin-count-objects'	Junio C Hamano	2009-11-24
\| \|\ \ \
\| \| * \| \|	git-count-objects: Fix a disk-space under-estimate on Cygwin	Ramsay Jones	2009-11-19
\| \| \|/ /
\| * \| \|	Documentation: update descriptions of revision options related to '--bisect'	Christian Couder	2009-11-24
\| * \| \|	Enable support for IPv6 on MinGW	Martin Storsjö	2009-11-24
\| * \| \|	Refactor winsock initialization into a separate function	Martin Storsjö	2009-11-24
\| * \| \|	Merge branch 'rs/color-escape-has-zero-width'	Junio C Hamano	2009-11-23
\| \|\ \ \
\| \| * \| \|	strbuf_add_wrapped_text(): skip over colour codes	René Scharfe	2009-11-23
\| * \| \| \|	Merge branch 'bg/apply-doc'	Junio C Hamano	2009-11-23
\| \|\ \ \ \
\| \| * \| \| \|	Fix over-simplified documentation for 'git log -z'	Björn Gustavsson	2009-11-23
\| \| * \| \| \|	apply: Use the term "working tree" consistently	Björn Gustavsson	2009-11-22
\| \| * \| \| \|	apply: Format all options using back-quotes	Björn Gustavsson	2009-11-22
\| \| * \| \| \|	apply: apply works outside a repository	Björn Gustavsson	2009-11-22
\| \| * \| \| \|	Clarify and correct -z	Björn Gustavsson	2009-11-22
\| * \| \| \| \|	Merge branch 'mm/maint-hint-failed-merge'	Junio C Hamano	2009-11-23
\| \|\ \ \ \ \
\| \| * \| \| \| \|	user-manual: Document that "git merge" doesn't like uncommited changes.	Matthieu Moy	2009-11-22
\| \| * \| \| \| \|	merge-recursive: point the user to commit when file would be overwritten.	Matthieu Moy	2009-11-22
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'jc/log-stdin'	Junio C Hamano	2009-11-23
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add trivial tests for --stdin option to log family	Junio C Hamano	2009-11-23
\| \| * \| \| \| \|	Make --stdin option to "log" family read also pathspecs	Junio C Hamano	2009-11-20
\| \| * \| \| \| \|	setup_revisions(): do not call get_pathspec() too early	Junio C Hamano	2009-11-20
\| \| * \| \| \| \|	Teach --stdin option to "log" family	Junio C Hamano	2009-11-20
\| \| * \| \| \| \|	read_revision_from_stdin(): use strbuf	Junio C Hamano	2009-11-20
\| * \| \| \| \| \|	Merge branch 'mr/gitweb-snapshot'	Junio C Hamano	2009-11-23
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	t/gitweb-lib: Split HTTP response with non-GNU sed	Brian Gernhardt	2009-11-23
\| \| * \| \| \| \| \|	gitweb: Smarter snapshot names	Mark Rada	2009-11-08
\| \| * \| \| \| \| \|	gitweb: Document current snapshot rules via new tests	Jakub Narebski	2009-11-08
\| \| * \| \| \| \| \|	t/gitweb-lib.sh: Split gitweb output into headers and body	Jakub Narebski	2009-10-30
\| \| * \| \| \| \| \|	gitweb: check given hash before trying to create snapshot	Mark Rada	2009-09-29
\| * \| \| \| \| \| \|	Merge branch 'cc/replace'	Junio C Hamano	2009-11-23
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS	Christian Couder	2009-11-20
\| \| * \| \| \| \| \| \|	Documentation: fix typos and spelling in replace documentation	Christian Couder	2009-11-20
\| \| * \| \| \| \| \| \|	replace: use a GIT_NO_REPLACE_OBJECTS env variable	Christian Couder	2009-11-20
\| * \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2009-11-23
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	pack-objects: split implications of --all-progress from progress activation	Nicolas Pitre	2009-11-23
\| \| * \| \| \| \| \| \|	instaweb: restart server if already running	Stephen Boyd	2009-11-23