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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/pull-rebase-with-work-tree' into maint	Junio C Hamano	2011-11-01
\|\
\| *	pull,rebase: handle GIT_WORK_TREE better	Jeff King	2011-10-13
* \|	Merge branch 'js/i18n-scripts'	Junio C Hamano	2011-08-25
\|\ \
\| * \|	pull: take advantage of eval_gettextln	Jon Seymour	2011-08-08
* \| \|	Merge branch 'oa/pull-reflog'	Junio C Hamano	2011-08-08
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	pull: remove extra space from reflog message	Ori Avtalion	2011-08-01
* \| \|	i18n: git-pull eval_gettext + warning message	Ævar Arnfjörð Bjarmason	2011-05-21
* \| \|	i18n: git-pull eval_gettext + die message	Ævar Arnfjörð Bjarmason	2011-05-21
* \| \|	i18n: git-pull die messages	Ævar Arnfjörð Bjarmason	2011-05-21
* \| \|	i18n: git-pull add git-sh-i18n	Ævar Arnfjörð Bjarmason	2011-05-21
\|/ /
* \|	Merge branch 'mz/rebase'	Junio C Hamano	2011-04-28
\|\ \
\| * \|	rebase: use @{upstream} if no upstream specified	Martin von Zweigbergk	2011-02-10
\| \|/
* \|	Merge branch 'jl/submodule-fetch-on-demand'	Junio C Hamano	2011-04-04
\|\ \
\| * \|	fetch/pull: Add the 'on-demand' value to the --recurse-submodules option	Jens Lehmann	2011-03-09
* \| \|	pull: do not clobber untracked files on initial pull	Jeff King	2011-03-25
* \| \|	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	2011-03-19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	pull: propagate --progress to merge	Jeff King	2011-02-21
\| \|/
* \|	pull: do not display fetch usage on --help-all	Michael J Gruber	2011-02-15
\|/
*	Merge branch 'jl/fetch-submodule-recursive'	Junio C Hamano	2010-12-16
\|\
\| *	Add the 'fetch.recurseSubmodules' config setting	Jens Lehmann	2010-11-12
\| *	fetch/pull: Add the --recurse-submodules option	Jens Lehmann	2010-11-12
* \|	Porcelain scripts: Rewrite cryptic "needs update" error message	Ramkumar Ramachandra	2010-10-28
\|/
*	Merge branch 'en/rebase-against-rebase-fix'	Junio C Hamano	2010-08-21
\|\
\| *	pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches	Elijah Newren	2010-08-12
* \|	pull: do nothing on --dry-run	Jeff King	2010-05-25
* \|	Merge branch 'maint'	Junio C Hamano	2010-03-20
\|\ \
\| * \|	pull: replace unnecessary sed invocation	Stephen Boyd	2010-03-20
\| \|/
* \|	fetch and pull: learn --progress	Tay Ray Chuan	2010-02-24
\|/
*	pull: re-fix command line generation	Junio C Hamano	2010-01-24
*	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	2010-01-20
\|\
\| *	pull: Fix parsing of -X<option>	Junio C Hamano	2010-01-17
\| *	Teach git-pull to pass -X<option> to git-merge	Avery Pennarun	2010-01-17
* \|	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	2010-01-12
* \|	Merge branch 'maint'	Junio C Hamano	2009-12-08
\|\ \
\| * \|	pull: clarify advice for the unconfigured error case	Jan Krüger	2009-12-03
* \| \|	Revert recent "git merge <msg> HEAD <commit>..." deprecation	Junio C Hamano	2009-12-08
* \| \|	git-pull.sh: Fix call to git-merge for new command format	Horst H. von Brand	2009-12-02
\| \|/ \|/\|
* \|	Merge branch 'fc/doc-fast-forward'	Junio C Hamano	2009-11-15
\|\ \
\| * \|	Use 'fast-forward' all over the place	Felipe Contreras	2009-10-24
\| \|/
* \|	Teach 'git merge' and 'git pull' the option --ff-only	Björn Gustavsson	2009-10-30
\|/
*	pull: improve advice for unconfigured error case	Jeff King	2009-10-09
*	git-pull: dead code removal	Junio C Hamano	2009-10-05
*	pull: Clarify "helpful" message for another corner casev1.6.5-rc2	Junio C Hamano	2009-09-22
*	allow pull --rebase on branch yet to be born	Jeff King	2009-08-12
*	pull: support rebased upstream + fetch + pull --rebase	Santi Béjar	2009-07-19
*	Merge branch 'sb/pull-rebase'	Junio C Hamano	2009-06-20
\|\
\| *	parse-remote: function to get the tracking branch to be merge	Santi Béjar	2009-06-11
* \|	pull, rebase: simplify to use die()	Stephen Boyd	2009-06-14
\|/
*	Convert to use quiet option when available	Dan Loewenherz	2009-04-22
*	Merge branch 'maint'	Junio C Hamano	2009-04-08
\|\