Commit graph

217 commits

Author SHA1 Message Date
Philipp Klose afefba7488 import from https://github.com/TheHippo/git-archive-file 2013-02-15 05:35:06 +01:00
TJ Holowaychuk 274b3dc819 Merge branch 'master' of github.com:visionmedia/git-extras 2013-01-28 12:27:32 -08:00
TJ Holowaychuk 4f711b23e6 remove INSTALL check 2013-01-28 12:19:41 -08:00
☃ pitr a06d552933 fix delete-branch to work with same-name tags
when there's a tag and a branch with the same name, git errors out with

`error: dst refspec MY_BRANCH matches more than one.`

git-delete-tag is not affected by this bug
2013-01-24 13:16:08 -05:00
TJ Holowaychuk 446bcd6f11 Merge pull request #155 from themalkolm/patch-4
Delete tag on origin even if it wasn't locally fetched yet.
2012-11-20 15:19:30 -08:00
TJ Holowaychuk 614d03364a Merge branch 'master' of github.com:visionmedia/git-extras 2012-11-20 15:18:14 -08:00
TJ Holowaychuk 41c1719d84 change git-effort(1) to use /bin/bash for now. Closes #78 2012-11-20 15:17:51 -08:00
Alexander Krasnukhin fbd2d8fe73 Delete tag on origin even if it wasn't locally fetched yet.
This should keep consistent logic among scripts i.e. git-delete-tag
should behave the same way as git-delete-branch.
2012-11-18 11:22:13 +01:00
Alexander Krasnukhin 670f531717 Delete branch on origin even if it wasn't locally fetched yet.
fix #144
2012-11-18 03:39:42 +01:00
Alexander Krasnukhin 2c346d256a Update bit/git-count
Matching "):" in the end can match commit subjects by mistake i.e. if
commit subject ends with "):" too (e.g. linux project has one such
commit).

To avoid this and any similar problems print summary only (-s).
Restructure output to look exactly as it was before with awk.
2012-11-17 13:40:43 +01:00
Alexander Krasnukhin 867299c3d9 Update bin/git-count
Use git-rev-list and builtin --count option

$ time git log --oneline | wc -l
30613
real	0m0.858s
user	0m0.684s
sys	0m0.239s

$ time git rev-list --count HEAD
30613
real	0m0.416s
user	0m0.396s
sys	0m0.018s
2012-11-17 01:41:59 +01:00
Damian Krzeminski 9b5a66a33b Make delete-merge-branches more user-friendly
It won't delete master. If you have a ligitimate reasn to delete master,
you probably should use delete-branch directly.
It works for multiple branches and it asks for confirmation each time.
-f|--force supresses confirmation
You can answer 'a' (all) when prompted, which means you won't be asked
again.
2012-11-01 07:42:58 -06:00
TJ Holowaychuk 5b72ac1b32 Revert "Added git-review to review files on branch since the branch was created."
This reverts commit 2bcd016f29.
2012-10-29 12:38:56 -07:00
Damian Krzeminski 9b62449166 Add remote parameter to git-release
When present <remote> is passed to git push
It makes git-release usable even when you have non-standard remotes
configured
2012-10-25 18:19:04 -06:00
Craig MacGregor 2bcd016f29 Added git-review to review files on branch since the branch was created. 2012-10-24 13:07:04 -04:00
Jean Jordaan 74d9c030be Fix pattern to find names.
Don't fall on your face if a commit message has ): in it somewhere.
2012-09-01 13:28:24 +07:00
nickl- 501d4b2759 Recommit of @d153e9c Changes to PR #114.
Added -s --soft arguments as well.
Default roll-back one with HEAD^ and only using ~ if commit count more than 1.
Added auto complete.
Updated documentation.
Attitude adjustment: don't throw errors and say NO as suggested in #114, have a can do attitude instead, leave the errors up to git to report.
2012-07-23 00:11:11 +02:00
nickl- 95630d7fcb Make all bin scripts executable. 2012-07-22 22:27:38 +02:00
nickl- c749fdc54f Complete git-ignore includes global.
Did a rebase merge from the old pull request #46 which we may close now.
Yet it wasn't as simple as that in the end but all things have a resolve:
Added 2 context type arguments to specify --local or --global.
Refactored usage into functions te prevent duplication.
Capable to view and append to both global gitignore as well as the .gitignore from the working folder.
Supports all types of ignore patters including ! negated, comments as well as blank lines.
Complete documentation including several examples.
2012-07-22 22:27:37 +02:00
nickl- 8f4a17044d Added git-show-tree.
See commits from all the branches plotted in a tree view.
2012-07-22 22:27:37 +02:00
TweeKane aa084d9b7b Add global gitignore to git-ignore output 2012-07-22 22:27:37 +02:00
Leila Muhtasib 6459db39aa git-undo now includes -h|--hard option.
-h option allows you to undo the last commit without keeping the
changes in the local working directory. Use with care.
Updated documentation to include new option.
2012-07-22 22:27:37 +02:00
nickl- 7398d10bd4 Fix #127 git-ignore won't add duplicates.
As per the bug identified in #127 git-ignore would add duplicate entries in .gitignore which is redundant and should not happen.
grep will suitably verify that the entry doesn't exit but only if the file actually exists or we will get an error on stderr. check if the
file exists with test -f and that the new entry is present or alternatively just go ahead and add the new value which will create the file if it didn't exist.
Running the same command again does not add the duplicate.
2012-07-21 13:34:35 +02:00
Alexis GRIMALDI ea7d0dcd92 Use git describe to fetch last tag 2012-07-16 16:52:13 +02:00
Brian J Brennan 9fad21c498 Recursive remove by default. 2012-07-14 14:12:15 -04:00
Brian J Brennan df853d1c5b Add git-obliterate for removing file from history. 2012-07-14 14:04:26 -04:00
TJ Holowaychuk 618e6a27c1 fix git-summary repo age, remove "ago" 2012-07-09 14:14:16 -07:00
TJ Holowaychuk 901c53c215 remove debug shit 2012-06-29 13:33:16 -07:00
TJ Holowaychuk c66e9536fe fix some quoting in git-pull-request and ensure the remote is available 2012-06-29 13:23:19 -07:00
TJ Holowaychuk 8b3040ed1b fix git-pull-request curl body quoting 2012-06-29 13:07:42 -07:00
TJ Holowaychuk 604b9f3c58 add default of HEAD to git-pull-request 2012-06-29 13:05:42 -07:00
TJ Holowaychuk d489ee24f5 add initial git-pull-request(1) implementation 2012-06-29 12:58:41 -07:00
TJ Holowaychuk 2287e07204 fix git-extras whitespace 2012-06-28 17:03:10 -07:00
Jesús Espino abf55ae76c Fixed 2 bashism and now works on bash and dash 2012-06-29 00:30:54 +02:00
TJ Holowaychuk c10be63473 Revert "Removing a bashism from git-effort"
This reverts commit cb6c34bc26.
2012-06-28 12:34:10 -07:00
Jesús Espino cb6c34bc26 Removing a bashism from git-effort 2012-06-28 21:15:34 +02:00
TJ Holowaychuk 38e41cf680 move active above commits in git-summary 2012-06-22 10:21:36 -07:00
TJ Holowaychuk 85c0b6dd88 Added git-delete-merged-branches(1) 2012-06-22 09:07:03 -07:00
TJ Holowaychuk adcaf78418 Revert "Added git-has(1) to check if a commit is present in the current branch"
This reverts commit 9bfe4af5db.
2012-06-21 15:31:05 -07:00
TJ Holowaychuk d90b17fde1 Merge branch 'master' of github.com:visionmedia/git-extras 2012-06-21 15:27:02 -07:00
TJ Holowaychuk 9bfe4af5db Added git-has(1) to check if a commit is present in the current branch 2012-06-21 15:26:42 -07:00
Jesús Espino 465eabef9b Adding shebang to the rename-tag command 2012-06-20 12:09:56 +02:00
TJ Holowaychuk 0c693b9244 Merge pull request #105 from muhtasib/fix_undo
git-undo now keeps file changes when undoing.
2012-06-16 12:18:25 -07:00
Leila Muhtasib e3952df2c1 Added git-info command.
Updated Authors document to include the name of the person whose idea this was.
2012-06-16 12:03:52 -04:00
TJ Holowaychuk db657ed486 Merge pull request #108 from muhtasib/git_effort_add_dots
Added dots for fill instead of blank spaces
2012-06-12 09:54:04 -07:00
Leila Muhtasib 4fa2c1d144 Added dots for fill instead of blank spaces 2012-06-12 11:44:33 -04:00
TJ Holowaychuk 962778061e Release 1.7.0 2012-06-11 11:00:53 -07:00
TJ Holowaychuk c9fedfa27f git-summary: shorter repo age 2012-06-11 10:57:26 -07:00
TJ Holowaychuk 510e2c4d1b git-summary: make : line up 2012-06-11 10:57:05 -07:00
Leila Muhtasib c6f1a3eb3b Added repo age to git-summary.
Shows intitial date of first commit and how long ago that was in parentheses.
2012-06-11 13:23:57 -04:00