utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 15:36:21 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
839 commits 5 branches 57 tags 6.1 MiB
Commit graph

7 commits

Author SHA1 Message Date
Kylie McClain 5b1ac3ccc6 use argument separator for usages of grep which can choke on weird input 2015-04-08 18:51:30 -04:00
hemanth.hm 7b7913fab1 More portable she-bangs. 2014-11-30 17:47:26 +05:30
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
TJ Holowaychuk c136afba67 git-squash: add --me flag to flatten the current branch 2013-06-18 13:44:55 -07:00
TJ Holowaychuk 07d5ee82ff fixed git-squash 2012-02-04 13:59:07 -08:00
TJ Holowaychuk 1c62e436b7 changed git-squash(1) 2012-02-04 13:51:43 -08:00
Tj Holowaychuk 902996edd2 Added git-squash 2012-02-01 13:07:14 -08:00