summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorJoe Hansche <jhansche@myyearbook.com>2012-03-05 11:41:19 -0500
committerShawn O. Pearce <sop@google.com>2012-06-13 10:34:41 -0700
commit5e57234ec619d0de930333a8dde3004d1dc575d6 (patch)
tree40f4eab3f13e5b4a1ca4ff3f501539ae63f44229 /project.py
parent5d016502ebc68bc054d85c98c6cdb51e0b63a1f5 (diff)
downloadgit-repo-5e57234ec619d0de930333a8dde3004d1dc575d6.tar.gz
Support automatically stashing local modifications during repo-rebase.
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
Diffstat (limited to 'project.py')
0 files changed, 0 insertions, 0 deletions