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

524 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
hemanth.hm 2f59bdfe91 Merge pull request #270 from kevinawoo/hotfix/git-locked 
git-locked
 2014-10-17 07:31:35 +05:30
Kevin Woo 6d7f10c0c6 added git-locked to check what files have been locked 2014-10-16 20:53:47 -05:00
hemanth.hm 55c8ad0141 Merge pull request #268 from GuillaumeSeren/bug/git-missing 
Fix #267, git-missing did not catch branch name.
 2014-10-15 08:02:04 +05:30
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 27554380d3 Merge pull request #264 from jamesmanning/patch-1 
Fixed descriptions: match required/optional params.
 2014-10-08 08:17:30 +05:30
James Manning 13d4803056 fixed descriptions: match required/optional params 2014-10-07 10:43:05 -04:00
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
hemanth.hm b6968afd5d Merge pull request #262 from rstacruz/gh-259-git-pr 
git-pr
 2014-10-07 14:05:26 +05:30
Rico Sta. Cruz ab67327ec0 Implement git-pr 2014-10-07 13:13:19 +08:00
hemanth.hm 53470fa7ad Merge pull request #261 from sanusart/master 
FIX: representation of git-info.
 2014-10-07 09:56:31 +05:30
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
hemanth.hm ac18bd16b4 Merge pull request #260 from brandondrew/patch-1 
typo fix.
 2014-10-04 15:06:30 +05:30
Brandon Zylstra a1b71202e7 import changes *from* a branch 2014-10-03 20:51:50 -04:00
hemanth.hm 68455cf996 Merge pull request #258 from spacewander/master 
use mixin to add 'is git repo' check.
 2014-09-25 08:07:13 +05:30
spacewander d9724f3b46 use mixin to add 'is git repo' check for some commands 
When those commands are used outside a git repo, 'Not a git repo!' will be
printed to stderr
 2014-09-25 00:41:43 +08:00
hemanth.hm 4cd35e8737 Merge pull request #255 from sanusart/master 
Bump version in `bin/git-extras`.
 2014-09-21 14:48:20 +05:30
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
hemanth.hm 32d034abd5 Changelogs for version 2.0.0 2014-09-20 18:21:16 +05:30
hemanth.hm 5d06124a9c Merge pull request #254 from spacewander/master 
add welcome in git-repl.
 2014-09-14 18:19:41 +05:30
spacewander 5f35004d08 add welcome in git-repl 2014-09-13 20:56:36 +08:00
hemanth.hm 48c8fd783e Merge pull request #253 from tailored-tunes/master 
Added option to specify base.
 2014-09-11 18:04:20 +05:30
meza be5362b025 Added option to specify base 2014-09-11 13:10:01 +01:00
hemanth.hm 526c4f6664 Merge pull request #252 from sorbits/patch-1 
Update homebrew URL and removed ‘buggy’ label.
 2014-08-29 13:33:35 +05:30
Allan Odgaard f0e3a84822 Update homebrew URL and remove ‘buggy’ label 
The ‘buggy’ label was added almost four years ago (bf25069fab) without clarification, so we assume it was motivated by issues that have long since been fixed.
 2014-08-29 09:42:04 +02:00
hemanth.hm 0127a0bd1c Merge pull request #250 from sanusart/master 
git-reset-file
 2014-08-27 18:15:10 +05:30
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 aa5457c14c Merge pull request #248 from rstacruz/patch-1 
Readme: document `git-delete-merged-branches`
 2014-08-14 19:19:52 +05:30
Rico Sta. Cruz e422f5ecbe Readme: document git-delete-merged-branches 2014-08-13 12:55:34 +08:00
hemanth.hm 9bbeb99177 Merge pull request #247 from visionmedia/perm_fix 
File perms fix.
 2014-07-30 17:58:30 +05:30
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
hemanth.hm 39945ab856 Merge pull request #244 from toksea/patch-1 
Fix wrong git-info heading level in Readme.md
 2014-07-25 08:36:03 +05:30
hemanth.hm 9fd861f775 Merge pull request #243 from sanusart/issue234 
Revert 2 commits to `git-changelog`
 2014-07-25 08:35:07 +05:30
Xiaopei Li c62563bc96 Fix wrong git-info heading level in Readme.md 
Fixed wrong git-info heading level: h1 -> h2
 2014-07-25 09:33:52 +08:00
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
hemanth.hm ee1a4f176a Merge pull request #240 from egrim/bug/delete-merged-branches-clobbers-master 
Exempt `master` from being deleted by `git-delete-merged-branches`.
 2014-07-22 12:02:29 +05:30
Evan Grim fb779658e3 Update docs to match git-delete-merged-branches behavior 2014-07-21 23:20:34 -05: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
hemanth.hm 1f8971bdbf Merge pull request #239 from bruno-/refactor_git_squash 
Refactor and improve `git squash`.
 2014-07-21 08:09:37 +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
hemanth.hm 458c08d96b Merge pull request #238 from techjacker/feature/git-fork 
git-fork!
 2014-07-15 20:33:27 +05:30
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
hemanth.hm 95b7c52812 Merge pull request #236 from jbnicolai/align-authors-git-summary 
Uses column -t to align summary output in a table.
 2014-07-14 20:28:13 +05:30
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