Commit graph

374 commits

Author SHA1 Message Date
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
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
nickl- e47d8d1a17 Added examples to git-commits-since 2012-07-22 22:27:37 +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
TJ Holowaychuk 515e94a0cd Merge pull request #128 from nickl-/git-extras-html-hyperlinks
help ronn make hyperlinks.
2012-07-21 05:05:14 -07:00
TJ Holowaychuk 5f86b54f33 Merge pull request #129 from nickl-/develop
general fixes and improvements
2012-07-21 05:01:28 -07: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
nickl- 815db8b89e help ronn make hyperlinks.
With hte manuals described in index.txt ronn will create hyperlinks of the (1) referenced words.
See http://rtomayko.github.com/ronn/ronn.1#LINK-INDEXES.
git-extras.html will now be browsable, actually anywhere else you use the referenced names ie. git-extras(1) as defined in index.txt will generate as hyperlinks in html while keeping the text versions rendereder similarly than they used to using exactly the same procedures as already documented.
2012-07-21 12:25:58 +02:00
nickl- ca7579e774 Fix typo in markdown and re-generate git-info 2012-07-21 09:08:11 +02:00
TJ Holowaychuk 60f8371d55 Merge pull request #126 from agrimaldi/fix-changelog-last-tag
Use git describe to fetch last tag in git-changelog
2012-07-16 08:59:16 -07:00
Alexis GRIMALDI ea7d0dcd92 Use git describe to fetch last tag 2012-07-16 16:52:13 +02:00
TJ Holowaychuk 2646f387fa Merge pull request #125 from brianloveswords/master
Add `git-obliterate`
2012-07-14 11:30:21 -07:00