Commit graph

7 commits

Author SHA1 Message Date
Angel Aguilera 77e55640d7 fix: git-squash docs. Replaced 'actual' with 'current' 2016-11-14 11:17:28 +01:00
Raphael Fleischlin bc17c1cb2e updated documentation because git-squash does no longer delete source-branch 2014-12-27 20:45:28 +01:00
spacewander 76e0dfef97 replace visionmedia/git-extras to tj/git-extras
Although Github reserves the 'visionmedia' user space(a visit to there
will be redirected to 'tj'), it's better to
rename the links from visionmedia/git-extras to tj/git-extras
2014-11-06 17:12:01 +08:00
Brandon Zylstra a1b71202e7 import changes *from* a branch 2014-10-03 20:51:50 -04:00
Bruno Sutic b2576adae0 Refactor and improve git squash
`git squash` refactor:
- first argument can be a branch or a commit reference
- the `--me` argument is not required anymore
- use `git reset --soft` is squashing on a current branch
- if squashing on master branch, prompt for confirmation
- does not delete provided branch after squashing
- fix bug: if `git merge --squash` command fails, exit script

Update README and man pages.

Fixes #95
Closes #198
2014-07-20 17:33:15 +02:00
Tom Vincent 17cc7b0e57 Replace http with https for man Github urls 2012-09-25 14:13:53 +08:00
Jesús Espino 82041039a5 Adding delete-merge-branches, gh-pages, rename-tag and squash manpages 2012-06-28 21:14:17 +02:00