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

	Commit message (Expand)	Author	Age
*	Merge branch 'mm/maint-merge-ff-error-message-fix' into maint	Junio C Hamano	2009-12-08
\|\
\| *	builtin-merge: show user-friendly error messages for fast-forward too.	Matthieu Moy	2009-11-29
* \|	Merge branch 'ap/maint-merge-strategy-list-fix' into maint	Junio C Hamano	2009-12-03
\|\ \
\| * \|	builtin-merge.c: call exclude_cmds() correctly.	Avery Pennarun	2009-11-29
\| \|/
* \|	merge: do not add standard message when message is given with -m option	Junio C Hamano	2009-12-02
* \|	Do not misidentify "git merge foo HEAD" as an old-style invocation	Junio C Hamano	2009-12-02
* \|	merge: do not setup worktree twice	Jonathan Nieder	2009-11-10
\|/
*	Merge branch 'jk/maint-merge-msg-fix'	Junio C Hamano	2009-08-16
\|\
\| *	merge: indicate remote tracking branches in merge message	Jeff King	2009-08-09
\| *	merge: fix incorrect merge message for ambiguous tag/branch	Jeff King	2009-08-09
* \|	Merge branch 'js/run-command-updates'	Junio C Hamano	2009-08-10
\|\ \ \| \|/ \|/\|
\| *	run_command: return exit code as positive value	Johannes Sixt	2009-07-05
* \|	Merge branch 'tr/die_errno'	Junio C Hamano	2009-07-06
\|\ \ \| \|/ \|/\|
\| *	Use die_errno() instead of die() when checking syscalls	Thomas Rast	2009-06-27
\| *	Convert existing die(..., strerror(errno)) to die_errno()	Thomas Rast	2009-06-27
* \|	Fix various sparse warnings in the git source code	Linus Torvalds	2009-06-20
* \|	Merge branch 'cb/maint-no-double-merge'	Junio C Hamano	2009-06-13
\|\ \ \| \|/ \|/\|
\| *	refuse to merge during a merge	Clemens Buchacher	2009-06-01
* \|	parse-opts: prepare for OPT_FILENAME	Stephen Boyd	2009-05-25
\|/
*	Merge branch 'maint'	Junio C Hamano	2009-04-28
\|\
\| *	Merge branch 'maint-1.6.1' into maint	Junio C Hamano	2009-04-28
\| \|\
\| \| *	Merge branch 'maint-1.6.0' into maint-1.6.1	Junio C Hamano	2009-04-28
\| \| \|\
\| \| \| *	builtin-merge: fix a typo in an error message	Allan Caffee	2009-04-27
* \| \| \|	strbuf_branchname(): a wrapper for branch name shorthands	Junio C Hamano	2009-03-22
* \| \| \|	Rename interpret/substitute nth_last_branch functions	Junio C Hamano	2009-03-22
* \| \| \|	Turn the flags in struct dir_struct into a single variable	Johannes Schindelin	2009-02-18
\|/ / /
* \| \|	Teach @{-1} to git merge	Junio C Hamano	2009-02-13
* \| \|	Replace deprecated dashed git commands in usage	Alexander Potashev	2009-02-04
* \| \|	Move run_hook() from builtin-commit.c into run-command.c (libgit)	Stephan Beyer	2009-01-17
\|/ /
* \|	Make some of fwrite/fclose/write/close failures visible	Alex Riesen	2008-12-04
* \|	Teach/Fix pull/fetch -q/-v options	Tuncer Ayaz	2008-11-14
* \|	Merge branch 'mv/merge-noff'	Junio C Hamano	2008-10-19
\|\ \
\| * \|	builtin-commit: use reduce_heads() only when appropriate	Miklos Vajna	2008-10-03
* \| \|	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer	Brandon Casey	2008-10-12
* \| \|	Merge branch 'mv/merge-refresh'	Shawn O. Pearce	2008-10-09
\|\ \ \
\| * \| \|	builtin-merge: refresh the index before calling a strategy	Miklos Vajna	2008-10-03
\| \|/ /
* \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-10-09
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	builtin-merge.c: allocate correct amount of memory	Brandon Casey	2008-10-09
* \| \|	Replace xmalloc/memset(0) pairs with xcalloc	Brandon Casey	2008-10-08
\| \|/ \|/\|
* \|	Merge branch 'mv/merge-recursive'	Shawn O. Pearce	2008-09-25
\|\ \
\| * \|	builtin-merge: release the lockfile in try_merge_strategy()	Miklos Vajna	2008-09-06
\| * \|	builtin-merge: avoid run_command_v_opt() for recursive and subtree	Miklos Vajna	2008-08-30
* \| \|	Merge branch 'mv/commit-tree'	Shawn O. Pearce	2008-09-25
\|\ \ \
\| * \| \|	commit_tree(): add a new author parameter	Miklos Vajna	2008-09-10
\| \|/ /
* \| \|	Merge branch 'maint'	Shawn O. Pearce	2008-09-25
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	maint: check return of split_cmdline to avoid bad config strings	Deskin Miller	2008-09-24
* \|	Remove useless memset of static command name lists in builtin-merge.c	Alex Riesen	2008-08-28
* \|	Remove calculation of the longest command name from where it is not used	Alex Riesen	2008-08-28
* \|	Merge branch 'mv/merge-custom'	Junio C Hamano	2008-08-27
\|\ \
\| * \|	Fix "git-merge -s bogo" help text	Junio C Hamano	2008-08-20