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

499 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
hemanth.hm 42c63ac3f2 Merge pull request #235 from sanusart/patch-1 
FIX (git-changelog): check if un-pushed commits.
 2014-07-12 08:50:59 +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
hemanth.hm 390ba55211 Merge pull request #202 from julionc/protecting-files 
Locking files in git repository.
 2014-07-11 21:26:34 +05:30
Julio Napurí b298c0cba4 Update Readme.md with lock and unlock commands 2014-07-10 11:30:06 -05: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
hemanth.hm d2029c6efb Merge pull request #100 from niklasf/rebase-patch 
Added git-rebase-patch.
 2014-07-10 15:37:20 +05:30
Niklas Fiekas 3bd1b84759 Add git-rebase-patch 2014-07-10 09:54:17 +02:00
hemanth.hm 8df35250c6 Merge pull request #200 from emkay/patch-1 
Readme cleanup.
 2014-07-09 11:22:22 +05:30
hemanth.hm a9bad79e98 Merge pull request #195 from carlcasbolt/patch-1 
Updated readme of man pages.
 2014-07-09 11:18:03 +05:30
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 b328920fe5 Merge pull request #173 from accerqueira/master 
Uninstall targets and BINPREFIX for makefile.
 2014-07-08 09:09:00 +05:30
hemanth.hm a0e614e6ff Merge pull request #194 from makeusabrew/patch-1 
Fix git-squash typo.
 2014-07-08 08:55:58 +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 3b3efd7483 Merge pull request #219 from jhoffmann/patch-1 
Update Readme.md
 2014-07-06 12:37:41 +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