diff --git a/src/commandModel.js b/src/commandModel.js index 57e7c64e..0bf5df4f 100644 --- a/src/commandModel.js +++ b/src/commandModel.js @@ -282,8 +282,7 @@ OptionParser.prototype.getMasterOptionMap = function() { '--amend': false, '-a': false, // warning '-am': false, // warning - '-m': false, - '-C': false + '-m': false }, status: {}, log: {}, diff --git a/src/git.js b/src/git.js index b112347e..4a339f2c 100644 --- a/src/git.js +++ b/src/git.js @@ -535,19 +535,7 @@ GitEngine.prototype.commit = function() { // if we want to ammend, go one above if (this.commandOptions['--amend']) { targetCommit = this.resolveID('HEAD~1'); - // if they specify -C, go there - if (this.commandOptions['-C']) { - this.validateArgBounds(this.commandOptions['-C'], 1, 1, '-C'); - targetCommit = this.numBackFrom(this.getCommitFromRef(this.commandOptions['-C'][0]), 1); - } - id = this.rebaseAltID(this.getCommitFromRef('HEAD').get('id')); - } else { - if (this.commandOptions['-C']) { - throw new GitError({ - msg: 'I only support -C when doing --amend, sorry' - }); - } } var newCommit = this.makeCommit([targetCommit], id); diff --git a/todo.txt b/todo.txt index 5d355ee2..96a1dec7 100644 --- a/todo.txt +++ b/todo.txt @@ -35,7 +35,6 @@ Pre-publish things: extra command ideas: git log branchA ^branchB -git commit --amend -C HEAD 2013 Things ~~~~~~~~~~~~~~~~~~~~~~~~~~~