Commit graph

387 commits

Author SHA1 Message Date
TJ Holowaychuk d8492e68eb Merge pull request #166 from Frusty/master
Option to omit config on git-info
2013-02-19 09:47:57 -08:00
Jan Krueger b26c6524b5 Adding option to omit config in git-info 2013-02-19 17:54:28 +01:00
TJ Holowaychuk 274b3dc819 Merge branch 'master' of github.com:visionmedia/git-extras 2013-01-28 12:27:32 -08:00
TJ Holowaychuk 2527e38102 fix one-liner. Closes #164 2013-01-28 12:21:04 -08:00
TJ Holowaychuk 4f711b23e6 remove INSTALL check 2013-01-28 12:19:41 -08:00
TJ Holowaychuk 8eeed2752b Merge pull request #163 from pitr/patch-1
fix delete-branch to work with same-name tags
2013-01-27 13:27:11 -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 e94413f729 Merge pull request #160 from southly/fix-typo
fix typo
2013-01-23 08:36:54 -08:00
NANRI e71fa3f9e8 fix typo 2013-01-23 06:59:13 +09:00
TJ Holowaychuk 71c68cb9f4 Merge pull request #157 from gthb/patch-1
Move misplaced text into git effort section
2012-11-22 10:27:28 -08:00
Gunnlaugur Thor Briem 7b8c38a4bd Move misplaced text into git effort section 2012-11-22 18:19:19 +00: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
TJ Holowaychuk 708c81934b Merge pull request #154 from themalkolm/master
Delete branch on origin even if it wasn't locally fetched yet
2012-11-17 19:41:15 -08: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
TJ Holowaychuk ee0097b448 Merge pull request #153 from themalkolm/master
Update bin/git-count
2012-11-17 11:45:07 -08: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
TJ Holowaychuk 77f90aeba0 Merge pull request #152 from themalkolm/patch-1
Update bin/git-count
2012-11-16 17:20:13 -08: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
TJ Holowaychuk 567aef7680 Merge pull request #149 from code42day/pu
slightly more forgiving git-delete-merged-branches
2012-11-04 10:58:45 -08:00
Damian Krzeminski 72881c18ad docs updates for get-delete-merged-branches
-f|--force option added
2012-11-04 08:22:00 -07: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
TJ Holowaychuk fb38f798c0 Merge pull request #147 from code42day/pu
Add remote parameter to git-release
2012-10-26 13:07:38 -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
TJ Holowaychuk 115280714e Merge pull request #145 from craigerm/master
Adding git-review
2012-10-24 19:55:02 -07: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
TJ Holowaychuk 27a6e72498 Merge pull request #143 from d2s/patch-1
Fix broken URL from Readme.md
2012-10-18 08:29:30 -07:00
Daniel Schildt 04df3cbdaa Fix broken URL from Readme.md
Link to Homebrew repository was broken
because it did not have ``https://`` in the beginning.
2012-10-18 16:44:25 +03:00
TJ Holowaychuk 86a102e63e Merge pull request #140 from jean/master
Add usage note to delete-branch.
2012-10-01 08:49:32 -07:00
Jean Jordaan 082f556969 Add usage note to delete-branch. 2012-10-01 17:44:32 +07:00
TJ Holowaychuk 2838a8cf26 Merge pull request #139 from tlvince/github-https
Replace http with https for man Github urls
2012-09-25 08:34:27 -07:00
Tom Vincent 17cc7b0e57 Replace http with https for man Github urls 2012-09-25 14:13:53 +08:00
TJ Holowaychuk 1e267d5916 Merge pull request #136 from jean/master
Fix grep pattern to find committers.
2012-09-01 10:28:19 -07: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
TJ Holowaychuk 7f324175de Merge pull request #131 from nickl-/develop
general fixes and improvements pt 3
2012-07-24 08:48:18 -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- 1f2b3ea203 Alphabetically sorted bash_completion.
Makes it easier to work with and slightly optimizes things for bash_completion which sorts these completions alphabetically.
2012-07-22 22:51:57 +02:00
TJ Holowaychuk 4353eee352 Merge pull request #130 from nickl-/develop
general fixes and improvements pt 2
2012-07-22 13:32:31 -07:00
nickl- f076565a98 Generate only a single manual.
Added the ability to pass the .md document template as argument to manning-up.sh which will only generate the single document and rename the .1.html correctly before exiting and thus not building the index and all the docs again.
Includes updated documentation.
2012-07-22 22:27:38 +02:00
nickl- 2dc72a1d3b merge with muthasib as per pull req #114.
Pull req #114 Add -h --hard to git-undo.
2012-07-22 22:27:38 +02:00
nickl- 79c8753436 Add bash_completion for new git-ignore switches. 2012-07-22 22:27:38 +02:00
nickl- 95630d7fcb Make all bin scripts executable. 2012-07-22 22:27:38 +02:00
nickl- b7f5529b73 Add docs for shorthand version of --list. 2012-07-22 22:27:38 +02:00
nickl- 2ca31a8268 All documentation updated as a result from shell script.
The automated shell script now refreshed all the documentation and renamed the .1.html versions so no redundant files left.
2012-07-22 22:27:38 +02:00
nickl- b7fe4c123a The complete index of all available documents. 2012-07-22 22:27:37 +02:00
nickl- 7007b6e6e5 Added automated manual generation.
Bash script which rebuilds the indexes (index.txt and the links listed in git-extras.md) based on the collection of .md file documents avalable.
By interrogating the .md file for the documented description we null and void yet another possible consistency issue and avoid manual duplication mistakes.
Once the indexes are up to date we start from the begining of the directory listing again calling ronn on each .md to generate the man and html files as well as renaming the incerrectly name html file.

Result several incorrectly named .html documents are now removed, and all the documentation is up to date.
Documentation also updated.
2012-07-22 22:27:37 +02:00
nickl- 2aeb45a160 whitespace only 2012-07-22 22:27:37 +02:00