Files
git/Documentation
John Keeping ad8261d212 rebase: use reflog to find common base with upstream
Commit 15a147e (rebase: use @{upstream} if no upstream specified,
2011-02-09) says:

	Make it default to 'git rebase @{upstream}'. That is also what
	'git pull [--rebase]' defaults to, so it only makes sense that
	'git rebase' defaults to the same thing.

but that isn't actually the case.  Since commit d44e712 (pull: support
rebased upstream + fetch + pull --rebase, 2009-07-19), pull has actually
chosen the most recent reflog entry which is an ancestor of the current
branch if it can find one.

Add a '--fork-point' argument to git-rebase that can be used to trigger
this behaviour.  This option is turned on by default if no non-option
arguments are specified on the command line, otherwise we treat an
upstream specified on the command-line literally.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-10 10:56:30 -08:00
..
2013-12-03 11:16:56 -08:00
2013-12-03 11:44:12 -08:00
2013-10-23 13:21:48 -07:00
2013-07-22 16:06:48 -07:00
2013-02-14 10:29:01 -08:00
2013-09-17 11:42:51 -07:00
2013-09-04 12:23:25 -07:00
2012-06-19 11:35:19 -07:00
2013-09-09 14:50:36 -07:00
2013-10-23 13:21:31 -07:00
2013-12-03 11:41:41 -08:00
2013-09-17 11:42:51 -07:00
2011-09-06 11:42:12 -07:00
2013-05-29 14:23:04 -07:00
2013-04-12 12:00:52 -07:00
2013-10-18 13:50:12 -07:00
2011-03-11 10:59:16 -05:00
2013-04-12 12:00:52 -07:00
2013-12-03 11:16:56 -08:00
2013-12-03 11:41:46 -08:00
2013-10-22 11:23:31 -07:00
2013-06-09 13:45:32 -07:00
2013-07-22 16:06:48 -07:00
2013-09-20 12:38:10 -07:00
2013-09-17 11:42:54 -07:00