ump 3.1.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/commands.js +3 -3
  2. package/package.json +1 -1
package/lib/commands.js CHANGED
@@ -29,13 +29,13 @@ const commands = {
29
29
  // Need to pull before mucking with files, so we can stop it if git branch isn't clean.
30
30
  // Otherwise files will be bumped and committed but not pushed and things will get messed up.
31
31
  // **We can autostash on pull because we handle existence of uncommitted files later
32
- const pullRebase = 'git pull --rebase --autostash';
32
+ const pullAutostash = 'git pull --autostash';
33
33
 
34
34
  return {
35
- log: pullRebase,
35
+ log: pullAutostash,
36
36
  cmd: function() {
37
37
 
38
- return exec(pullRebase)
38
+ return exec(pullAutostash)
39
39
  .then(({stdout, stderr}) => {
40
40
  console.log(stdout);
41
41
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ump",
3
3
  "title": "ump",
4
- "version": "3.1.0",
4
+ "version": "3.1.1",
5
5
  "description": "Bump without the B",
6
6
  "scripts": {
7
7
  "test": "npm run test:clean && npm run test:pre && npm run test:run",