tools/git-repo.git - Mirror of gerrit.googlesource.com/git-repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Support automatically stashing local modifications during repo-rebase.	Joe Hansche	2012-06-13	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently repo-rebase requires that all modifications be committed locally before it will allow the rebase. In high-velocity environments, you may want to just pull in newer code without explicitly creating local commits, which is typically achieved using git-stash. If called with the --auto-stash command line argument, and it is determined that the current index is dirty, the local modifications are stashed, and the rebase continues. If a stash was performed, that stash is popped once the rebase completes. Note that there is still a possibility that the git-stash pop will result in a merge conflict. Change-Id: Ibe3da96f0b4486cb7ce8d040639187e26501f6af
*	rebase: Pass through more optionsv1.6.10.1	Shawn O. Pearce	2010-07-15	1	-7/+39
\| \| \| \| \| \| \| \|	Passing through --whitespace=fix to rebase can be useful to clean up a branch prior to uploading it for review. Change-Id: Id85f1912e5e11ff9602e3b342c2fd7441abe67d7 Signed-off-by: Shawn O. Pearce <sop@google.com>
*	rebase: Automatically rebase branch on upstrea	Daniel Sandler	2010-07-15	1	-0/+75
	Usage: repo rebase [[-i] <project>...] Rebases the current topic branch of the specified (or all) projects against the appropriate upstream. Note: Interactive rebase is currently only supported when exactly one project is specified on the command line. Change-Id: I7376e35f27a6585149def82938c1ca99f36db2c4 Signed-off-by: Shawn O. Pearce <sop@google.com>