12 commits

Author	SHA1	Message	Date
tom	da34968ec3	squash help: corrects option name in PR	2020-10-11 14:16:52 +02:00
thomas menzel	35d44c97cc	Merge remote-tracking branch 'u/master' into HEAD	2020-10-11 14:12:32 +02:00
José María Gutiérrez @TheTechOddBug	2ef6ea4b96	Fixing summary for --squash-msg option.	2020-10-10 01:08:32 +02:00
elonderin	c41f0164cc	Updates git-squash.md: fixes help which was unclear and had remnants from copied template it appears	2020-10-05 17:00:02 +02:00
spacewander	1924eb9197	git-squash: add --squash-messages to concat commit messages into one.	2019-11-05 10:28:51 +08:00
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