Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: git_cl/git_cl.py

Issue 6575031: Use reset --soft to squash before dcomitting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl/git_cl.py
diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
index 1be555b66a32ad3519af09e5d31d4eb7068e02f4..bbb5d079f2a2099f373f1064cc3951a0a1852587 100644
--- a/git_cl/git_cl.py
+++ b/git_cl/git_cl.py
@@ -977,8 +977,8 @@ def SendUpstream(parser, args, cmd):
# we clean up the branches.
retcode = -1
try:
- RunGit(['checkout', '-q', '-b', MERGE_BRANCH, base_branch])
- RunGit(['merge', '--squash', cl.GetBranchRef()])
+ RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
+ RunGit(['reset', '--soft', base_branch])
if options.contributor:
RunGit(['commit', '--author', options.contributor, '-m', description])
else:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698