Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-28833

Add possibility to squash merge

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      Can we add the squash option to the merge command on the git client plugin?

        Attachments

          Activity

          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Thierry Lacour
          Path:
          src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
          src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
          src/main/java/org/jenkinsci/plugins/gitclient/MergeCommand.java
          src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java
          http://jenkins-ci.org/commit/git-client-plugin/e819fb8efcecf0df7fe617b081b2643a75516612
          Log:
          Implemented Squash option on MergeCommand. JENKINS-28833

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Thierry Lacour Path: src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java src/main/java/org/jenkinsci/plugins/gitclient/MergeCommand.java src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java http://jenkins-ci.org/commit/git-client-plugin/e819fb8efcecf0df7fe617b081b2643a75516612 Log: Implemented Squash option on MergeCommand. JENKINS-28833
          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Mark Waite
          Path:
          src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
          src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
          src/main/java/org/jenkinsci/plugins/gitclient/MergeCommand.java
          src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java
          http://jenkins-ci.org/commit/git-client-plugin/f4d2340e6c11bde8b93abcba686c6179bcae1515
          Log:
          Merge pull request #169 from Praqma/JENKINS-28833

          Implemented Squash option on MergeCommand. JENKINS-28833

          Compare: https://github.com/jenkinsci/git-client-plugin/compare/31e556b29cd1...f4d2340e6c11

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Mark Waite Path: src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java src/main/java/org/jenkinsci/plugins/gitclient/MergeCommand.java src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java http://jenkins-ci.org/commit/git-client-plugin/f4d2340e6c11bde8b93abcba686c6179bcae1515 Log: Merge pull request #169 from Praqma/ JENKINS-28833 Implemented Squash option on MergeCommand. JENKINS-28833 Compare: https://github.com/jenkinsci/git-client-plugin/compare/31e556b29cd1...f4d2340e6c11
          Hide
          markewaite Mark Waite added a comment -

          Included in git client plugin 1.18.0 released 18 July 2015

          Show
          markewaite Mark Waite added a comment - Included in git client plugin 1.18.0 released 18 July 2015

            People

            • Assignee:
              ndeloof Nicolas De Loof
              Reporter:
              thi Thierry Lacour
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: