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

	Commit message (Expand)	Author	Age
*	Merge branch 'lh/merge'	Junio C Hamano	2007-10-03
\|\
\| *	git-merge: add --ff and --no-ff options	Lars Hjemli	2007-09-23
\| *	git-merge: add support for --commit and --no-squash	Lars Hjemli	2007-09-23
\| *	git-merge: add support for branch.<name>.mergeoptions	Lars Hjemli	2007-09-23
\| *	git-merge: refactor option parsing	Lars Hjemli	2007-09-23
\| *	git-merge: fix faulty SQUASH_MSG	Lars Hjemli	2007-09-23
* \|	Merge branch 'jc/autogc'	Junio C Hamano	2007-10-03
\|\ \
\| * \|	Invoke "git gc --auto" from commit, merge, am and rebase.	Junio C Hamano	2007-09-06
* \| \|	Merge branch 'je/hooks'	Junio C Hamano	2007-09-23
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add post-merge hook, related documentation, and tests.	Josh England	2007-09-18
\| \|/
* \|	Supplant the "while case ... break ;; esac" idiom	David Kastrup	2007-09-23
\|/
*	git-merge: do up-to-date check also for all strategies	Junio C Hamano	2007-08-27
*	Enable "git rerere" by the config variable rerere.enabled	Johannes Schindelin	2007-07-06
*	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	2007-07-02
*	Merge branch 'ar/mergestat'	Junio C Hamano	2007-05-29
\|\
\| *	Add a configuration option to control diffstat after merge	Alex Riesen	2007-05-24
* \|	Merge branch 'maint'	Junio C Hamano	2007-05-26
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'maint-1.5.1' into maint	Junio C Hamano	2007-05-26
\| \|\
\| \| *	More echo "$user_message" fixes.	Jeff King	2007-05-26
* \| \|	Add colour support in rebase and merge tree diff stats output.	James Bowes	2007-05-10
\|/ /
* \|	A new merge stragety 'subtree'.	Junio C Hamano	2007-04-07
\|/
*	git-merge: Put FETCH_HEAD data in merge commit message	Michael S. Tsirkin	2007-03-22
*	git-merge: finish when git-read-tree fails	Santi Béjar	2007-03-16
*	git-merge: warn when -m provided on a fast forward	J. Bruce Fields	2007-03-11
*	git-merge: fail correctly when we cannot fast forward.	Junio C Hamano	2007-03-03
*	git-merge: minor fix for no_trivial_merge_strategies.	Junio C Hamano	2007-02-16
*	[PATCH] Rename git-repo-config to git-config.	Tom Prince	2007-01-28
*	git-merge: leave sensible reflog message when used as the first level UI.	Junio C Hamano	2007-01-26
*	Merge branch 'sp/merge' (early part)	Junio C Hamano	2007-01-14
\|\
\| *	Improve merge performance by avoiding in-index merges.	Shawn O. Pearce	2007-01-10
* \|	Allow whole-tree operations to be started from a subdirectory	Junio C Hamano	2007-01-12
* \|	Disallow working directory commands in a bare repository.	Shawn O. Pearce	2007-01-10
\|/
*	fail pull/merge early in the middle of conflicted merge	Junio C Hamano	2007-01-01
*	Honor pull.{twohead,octopus} in git-merge.	Shawn O. Pearce	2006-12-28
*	Use GIT_REFLOG_ACTION environment variable instead.	Shawn O. Pearce	2006-12-28
*	Display 'theirs' branch name when possible in merge.	Shawn O. Pearce	2006-12-23
*	merge and reset: adjust for "reset --hard" messages	Junio C Hamano	2006-12-22
*	merge: give a bit prettier merge message to "merge branch~$n"	Junio C Hamano	2006-12-16
*	Merge branch 'jc/read-tree-ignore'	Junio C Hamano	2006-12-13
\|\
\| *	Loosen "working file will be lost" check in Porcelain-ish	Junio C Hamano	2006-12-05
* \|	git merge: reword failure message.	Junio C Hamano	2006-12-13
* \|	git-merge: fix "fix confusion between tag and branch" for real	Junio C Hamano	2006-12-06
* \|	git-merge: squelch needless error message.	Junio C Hamano	2006-12-06
\|/
*	git-merge: fix confusion between tag and branch	Junio C Hamano	2006-12-02
*	git-merge: do not leak rev-parse output used for checking internally.	Junio C Hamano	2006-11-26
*	git-merge: tighten error checking.	Junio C Hamano	2006-11-26
*	merge: allow merging into a yet-to-be-born branch.	Junio C Hamano	2006-11-21
*	git-merge: make it usable as the first class UI	Junio C Hamano	2006-11-21
*	remove merge-recursive-old	Junio C Hamano	2006-11-21
*	Merge branch 'maint'	Junio C Hamano	2006-10-22
\|\