ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/5] incubator-ignite git commit: # gg-9869:
Date Thu, 05 Mar 2015 11:35:05 GMT
# gg-9869:


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6cbc111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6cbc111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6cbc111

Branch: refs/heads/gg-9869
Commit: f6cbc11130d38357b317d309bb68eb8c884f0f2e
Parents: 6873679
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 5 14:14:14 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 5 14:14:14 2015 +0300

----------------------------------------------------------------------
 scripts/git-patch-functions.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6cbc111/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index 1edbba9..aa2c9f2 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -32,11 +32,11 @@ formatPatch () {
     cd ${GIT_HOME}
 
     echo ">>>>>> Checkout origin/${DEFAULT_BRANCH} as master_copy"
-    git checkout -b master_copy origin/${DEFAULT_BRANCH}
-
-#    echo '>>>>>> Merge '${PATCHED_BRANCH}' at tmpsquash'
-    git merge --squash ${PATCHED_BRANCH}
-    git commit -a -m "My squashed commits"
+    git checkout ${DEFAULT_BRANCH}
+    git checkout -b tmppatch
+#    git merge --squash ${PATCHED_BRANCH} # In one commit
+    git merge ${PATCHED_BRANCH}
+#    git commit -a -m ""
 
     git checkout ${PATCHED_BRANCH}
 


Mime
View raw message