utils-code/tj.git-extras

Fork 0

mirror of https://github.com/tj/git-extras.git synced 2026-09-11 07:56:18 -04:00

Commit graph

Author SHA1 Message Date

Author	SHA1	Message	Date
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
nickl-	2ca31a8268	All documentation updated as a result from shell script. The automated shell script now refreshed all the documentation and renamed the .1.html versions so no redundant files left.	2012-07-22 22:27:38 +02: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

nickl-

2ca31a8268

All documentation updated as a result from shell script.

The automated shell script now refreshed all the documentation and renamed the .1.html versions so no redundant files left.

2012-07-22 22:27:38 +02:00

3 commits