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

294 commits

Author SHA1 Message Date
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
hemanth.hm 619232ef86 Merge pull request #220 from sanusart/master 
Add check for no changes in the tree (no sub-modules)
 2014-07-09 10:56:25 +05:30
hemanth.hm 1a6cbf2433 Merge pull request #63 from justone/git_missing 
Adding `git-missing` command.
 2014-07-09 10:48:17 +05:30
hemanth.hm 0353b63e63 Merge pull request #216 from stephenmathieson/fix/changelog-large-versions 
Changelog formatting for large version numbers.
 2014-07-08 08:54:40 +05:30
hemanth.hm ab5c0364f6 Merge pull request #188 from twolfson/dev/add.multi.delete.squashed 
Added multi-delete for git-delete-branch and git-delete-tag.
 2014-07-07 18:04:11 +05:30
hemanth.hm 47bb6e0f74 Merge pull request #222 from jsipprell/pull/filenames-containing-spaces 
git-effort handles filenames with whitespace.
 2014-07-06 12:36:08 +05:30
hemanth.hm 039bb5c318 Merge pull request #223 from mwoc/master 
Restoring debian changelog compatibility.
 2014-07-06 12:34:21 +05:30
hemanth.hm a87403b57f Merge pull request #229 from yggdr/master 
/usr/bin/env for portability.
 2014-07-06 11:55:00 +05:30
eszabpt 698d027a0a Make git-obliterate work if there are whitespaces in filename 2014-07-04 11:16:17 +02:00
Konstantin Schukraft e4290dfb32 invoke bash via /usr/bin/env for portability 2014-07-02 09:41:37 +02:00
TJ Holowaychuk d437418b3c Release 1.9.1 2014-06-21 21:54:12 -07:00
Patryk Małek 4145f228e4 Fixed git-changelog errors when multiple files match change|history 2014-06-16 16:32:47 +02:00
Patryk Małek de6463fbee Fixed git-changelog errors on first usage 2014-06-16 16:27:57 +02:00
Jarod Stewart 374df5cabf Letter spacing in author list 
This is a quick fix for the letter spacing for the author list.
 2014-05-07 22:58:41 -06:00
Maarten Winter 0687de734c Use two-space indents for log entry output, so it again is debian changelog compatible (as before commit 1235e4a5) 2014-04-29 10:51:30 +02:00
Jesse Sipprell 1479b9633a
git effort: handle filenames containing whitespace cleanly 2014-04-22 20:21:10 -04:00
soffolk a4cf7462f0 Add line-summary as an options --line & doc 2014-04-22 21:50:22 +08:00
Sasha Khamkov f2a41c54b1 Add check for no changes in the tree (no sub-modules) 2014-04-06 00:10:08 +03:00
Stephen Mathieson fde9d1cd30 Fix changelog formatting for large version numbers 
This allows for version numbers which require more than 18 characters to
be underlined and pretty. :)
 2014-02-24 11:45:42 -05:00
Damian Krzeminski 31bbed4ac8 Add --no-merges option to changelog 
--no-merges allows for generating changelog without information about
merge commits
 2013-12-01 18:18:03 -05:00
TJ Holowaychuk 0faaec7ce9 Merge pull request #199 from tlvince/refactor/git-delete-merged-branches 
Simplify delete-merged-branches
 2013-11-19 08:43:14 -08:00
Nathan Rajlich 519f678938 git-changelog: don't output a trailing space after the date 
This has been driving me and others crazy for forever.
/cc @guille @MatthewMueller
 2013-11-18 16:13:55 -08:00
Tom Vincent a909c8d20f Simplify delete-merged-branches 
This will delete branches merged into the current branch.

This uses `-d` and is therefore safer than the current script (which uses `-D`).
IMO, this mitigates the need to prompt.
 2013-10-24 12:06:24 +01:00