Commit graph

244 commits

Author SHA1 Message Date
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
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
TJ Holowaychuk c45e2b8f5f Release 1.9.0 2013-06-18 13:45:24 -07:00
TJ Holowaychuk c136afba67 git-squash: add --me flag to flatten the current branch 2013-06-18 13:44:55 -07:00
Aurélien Scoubeau ed24416bf7 Make repository_age() "history rewrite safe"
Change commit date to author date, so that the repo age doesn't change if history rewriting tools (such as amend, rebase, filter-branch) are used.
2013-06-17 12:56:39 +02:00
soffolk dbc9fe0be4 modify to count for text file 2013-05-18 17:45:17 +08:00
soffolk 0386eb5bbe add git-line-summary 2013-05-18 16:02:02 +08:00
TJ Holowaychuk 84855b803d Release 1.8.0 2013-05-15 10:10:30 -07:00
TJ Holowaychuk 9800b326e5 Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 10:01:28 -07:00
TJ Holowaychuk 111f04bb57 Merge pull request #102 from Phally/tag-in-command-line
Entering the tag name in the command line with git-changelog
2013-05-15 10:01:22 -07:00
TJ Holowaychuk a03bb363dd Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 09:59:36 -07:00
TJ Holowaychuk 82cdab83f5 Merge pull request #165 from TheHippo/git-archive-file
Git archive file
2013-05-15 09:59:29 -07:00
TJ Holowaychuk dc52254843 Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 09:57:57 -07:00
TJ Holowaychuk 7d2f933945 Merge pull request #168 from js-coder/master
git-repl improvements
2013-05-15 09:57:50 -07:00
TJ Holowaychuk 46175a69b9 Merge branch 'master' of github.com:visionmedia/git-extras 2013-03-25 08:24:07 -07:00
TJ Holowaychuk f6bb7ba042 git-delete-merged-branches: use -D instead of delete-branch
too slow
2013-03-25 08:23:57 -07:00
Greg Allen a79c51c7ad removed unnecessary git checkout for bug, feature and refactor 2013-03-07 17:44:11 -08:00
Phally 4f55198dca Added support for a --tag argument to directly set the tag name in the header. 2013-03-03 16:46:32 +01:00
Phally 1235e4a5ad Added support for multiple arguments in git-changelog. 2013-03-03 16:46:32 +01:00
Florian H ae5b596117 Execute commands that are already prefixed with git directly 2013-03-03 16:33:11 +01:00
Florian H ce888d0664 Execute a shell command, if the command is prefixed with ! 2013-03-03 16:24:07 +01:00
Jan Krueger b26c6524b5 Adding option to omit config in git-info 2013-02-19 17:54:28 +01:00
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