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
577 commits 5 branches 57 tags 6.1 MiB
Commit graph

316 commits

Author SHA1 Message Date
spacewander e1cedf7fd2 add enough X to fix #303. 
GNU mktemp requires at least three X in the last part of template.
 2015-02-02 21:35:44 +08:00
wooorm 1199186652 Fix typo in in git ignore message 2015-01-23 11:58:38 +01:00
hemanth.hm e738f760ae Avoid duplicating asterisk. 
Closes https://github.com/tj/git-extras/pull/218
 2015-01-18 22:10:39 +05:30
Jon Ander Peñalba bfd38ca891 When deleting a branch check if git has config. 
Don't assume that the remote is always origin and that the
remote branch name is the same as the local one
 2014-12-17 11:33:09 +01:00
hemanth.hm 081e14f88f Merge pull request #226 from tsldh/master 
Added changelog -c flag to git-release.
 2014-12-07 10:49:24 +05:30
David Hartmann 292586d96f added changelog to release as optional flag 
- rewrote the flags to contain multiple
- added -c as changelog option
 2014-12-06 14:43:34 -05:00
Matthew Avant 7701ba4069 Use mktemp for temporary file creation. 2014-12-04 11:01:40 -08:00
dead-horse 9a9be49b63 make release hook more flexible 2014-12-03 00:57:41 +08:00
Ben Parnell 0b0b688c17 added --no-color to git-delete-merged-branches 2014-12-01 10:20:26 +00:00
hemanth.hm 7b7913fab1 More portable she-bangs. 2014-11-30 17:47:26 +05:30
Dan Jackson d7d6ff2fed Use process-specific tmp file and clean up on exit 
Fixes #279 using the suggestion from @hemanth, with some minor tweaks:

- I kept the leading . because I figured there was a reason it was put there originally.
- Changed the show_cursor method that's called when the process exits (prematurely or naturally) to be show_cursor_and_cleanup, and added a line to it that cleans up the tmp file.
 2014-11-26 10:23:54 -08:00
Valérian Galliat 5ee706b585 git-info: POSIX compliance 
Replace `echo -n` (non-POSIX) with an helper function `echon` echoing a
newline after given expression.
 2014-11-26 14:02:29 +01:00
hemanth.hm 53e4f3c89d Fixes #277 2014-11-21 00:31:43 +05:30
hemanth.hm e7990ed810 Merge pull request #276 from spacewander/master 
git-ignore will cd root to find .gitignore.
 2014-11-21 00:27:09 +05:30
Hemanth.HM cb0e56639c Version bump. 2014-11-18 21:37:03 +05:30
spacewander 0374044790 modify the behavior of git-ignore, now it will cd root to find .gitignore 2014-11-17 21:36:56 +08:00
spacewander 92c34e8e00 add new command 'git root' to show the path to root of repo 2014-11-13 16:12:50 +08:00
hemanth.hm 1748fb29c5 Merge pull request #271 from bohnman/git-rename-tag-fix 
tag to tags
 2014-11-08 11:14:59 +05:30
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
Ryan Bohn 53efa98c15 changing incorrect reference of tag to tags 2014-11-05 15:29:48 -05:00
Kevin Woo 6d7f10c0c6 added git-locked to check what files have been locked 2014-10-16 20:53:47 -05:00
Guillaume Seren db0f610bc1
Fix #267, git-missing did not catch branch name. 
It was a bug on my setup, the test did no detect the
branch name, so I change:
if [[ $arg != -* ]]; then
by
if [ -n "${arg}" ]; then

According to test man page, -n:
«True if the length of string is non-zero.»

I also added quote and {} around the param,
to prevent bash expension around strange char.
 2014-10-14 16:24:18 +02:00
hemanth.hm 3c7d4e67f4 Version 2.1.0 2014-10-13 17:51:54 +05:30
hemanth.hm e294617d10 Fixes #266 2014-10-13 17:49:34 +05:30
hemanth.hm daf0c0c048 Merge pull request #263 from Yitsushi/bug/180-does-not-check-out-branch-if-it-already-exists 
fix #180 and #232 feature|bug|refactor checkout.
 2014-10-07 17:27:55 +05:30
Balazs Nadasdi b9478d64b7 fix #180 and #232 feature|bug|refactor checkout 
If branch creation in feature|bug|refactor returns a non-zero value
then simply try to switch to branch
 2014-10-07 10:57:00 +02:00
Rico Sta. Cruz ab67327ec0 Implement git-pr 2014-10-07 13:13:19 +08:00
Sasha Khamkov ccf029dabe FIX: representation of git-info 
- fix representation of `git-info` output

$ git info --no-config

Before:

 ## Remote URLs:\n
 origin	https://github.com/sanusart/git-extras.git (fetch)
 origin	https://github.com/sanusart/git-extras.git (push)
 upstream	https://github.com/visionmedia/git-extras.git (fetch)
 upstream	https://github.com/visionmedia/git-extras.git (push)\n
 ## Remote Branches:\n
   origin/HEAD -> origin/master
   origin/fix_feature_refactor_bug
   origin/gh-pages
   origin/issue234
   origin/master
   origin/patch-1
   upstream/gh-pages
   upstream/master\n
 ## Local Branches:\n
 * master\n
 ## Most Recent Commit:\n
 commit ac18bd16b4
 Merge: 68455cf a1b7120
 Author: hemanth.hm <hemanth.hm@gmail.com>

     Merge pull request #260 from brandondrew/patch-1\n
 Type 'git log' for more commits, or 'git show <commit id>' for full commit details.\n

After:

git info --no-config

## Remote URLs:

origin	https://github.com/sanusart/git-extras.git (fetch)
origin	https://github.com/sanusart/git-extras.git (push)
upstream	https://github.com/visionmedia/git-extras.git (fetch)
upstream	https://github.com/visionmedia/git-extras.git (push)

## Remote Branches:

  origin/HEAD -> origin/master
  origin/fix_feature_refactor_bug
  origin/gh-pages
  origin/issue234
  origin/master
  origin/patch-1
  upstream/gh-pages
  upstream/master

## Local Branches:

* master

## Most Recent Commit:

commit ac18bd16b4
Merge: 68455cf a1b7120
Author: hemanth.hm <hemanth.hm@gmail.com>

    Merge pull request #260 from brandondrew/patch-1

Type 'git log' for more commits, or 'git show <commit id>' for full commit details.
 2014-10-06 21:59:53 +03:00
Sasha Khamkov 293119cf6c Bump version in bin/git-extras 
- Bump version to 2.0.0 in `bin/git-extras` to enable updating package
via `git-extras update`
 2014-09-21 09:55:56 +03:00
spacewander 5f35004d08 add welcome in git-repl 2014-09-13 20:56:36 +08:00
meza be5362b025 Added option to specify base 2014-09-11 13:10:01 +01:00
Sasha Khamkov b94fdd11c2 ADD: git-reset-file 
Reset single file to HEAD or certain commit-hash

- add git-reset-file
- add respective man files
 2014-08-27 10:42:58 +03:00
hemanth.hm 8127f10640 File perms fix. 2014-07-30 17:57:47 +05:30
hemanth.hm 9bc92e65c2 Merge pull request #242 from sanusart/fix_feature_refactor_bug 
Fix feature|refactor|bug testing argument for string length.
 2014-07-25 08:39:48 +05:30
Sasha Khamkov ba481f35c2 Revert 2 commits to git-changelog 
- Revert "FIX: check if un-pushed commits". This reverts commit bd80a4e512.

- Revert "Add check for no changes in the tree (no sub-modules)". This reverts commit f2a41c54b1.

Resolves #234
 2014-07-24 20:57:07 +03:00
Sasha Khamkov 3d8db9dbb9 Fix feature|refactor|bug testing argument for string lenght 
93d92ae338 (diff-dde525a12e9f5e19)

Seems only works while $2 is quoted, e.g. "$2"

Closes #241
 2014-07-24 10:28:51 +03:00
Evan Grim 36596a33b3 Exempt master from deleted branches 
This is helpful for those who use the `git-flow` branch model and might
be surprised to find that this script deletes their master branch.
 2014-07-21 23:05:30 -05: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
Andy 2024744f2b add git-fork 
update git-fork to add remotes refs as ssh

change fork source remote name to upstream

add man page for git-fork
 2014-07-15 10:11:44 +01:00
Joshua Appelman 04c43430aa Uses column -t to align summary output in a table. 2014-07-14 16:49:48 +02:00
hemanth.hm be12410e31 Merge pull request #221 from zlx/feature/git-summary-doc 
Make line-summary as sub-command.
 2014-07-14 20:01:20 +05:30
hemanth.hm 04d9deceb2 Merge pull request #224 from StewartJarod/patch-1 
Letter spacing in author list.
 2014-07-14 19:53:52 +05:30
hemanth.hm bbcaf7c324 Merge pull request #189 from rhacker/patch-1 
Add comment for the code.
 2014-07-13 20:57:28 +05:30
Sasha Khamkov bd80a4e512 FIX: check if un-pushed commits 
- switch the check for un-pushed commits from `diff-index` to more simple check
- still ignores sub-modules

Closes #234

Clarification: 
As pointed by @cristiandouce in #234 - my flow was different (and pretty stupid to be honest on some particular project of mine) so some other work flow scenarios was failing to pass. 

I still feel such check is needed, because it is still populates Changelog|History files with empty lines if no un-pushed commits exist, so @hemanth merge this one or revert the [619232e](619232ef86)
 2014-07-11 23:43:12 +03:00
Julio Napurí 08cdb7effb git-unlock Unlock local files in git repository 2014-07-10 11:27:58 -05:00
Julio Napurí 732ec9638f git-lock Lock files in git repository 2014-07-10 11:27:57 -05:00
Niklas Fiekas 3bd1b84759 Add git-rebase-patch 2014-07-10 09:54:17 +02:00
hemanth.hm b200552c90 Merge pull request #181 from zeroDivisible/feature/handle-misspellings 
git bug|feature|refactor accepts a single argument if not finishing.
 2014-07-09 11:13:02 +05:30
hemanth.hm 74acf8cab4 Merge pull request #193 from pzelnip/git-setup-no-overwrite 
`git-setup` checks for an existing .git in target dir.
 2014-07-09 11:01:42 +05:30
hemanth.hm 128bc2d5f8 Merge pull request #183 from chernjie/master 
`git-create-branch`: use HEAD instead of origin.
 2014-07-09 10:58:10 +05:30