Commit graph

336 commits

Author SHA1 Message Date
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
Brian J Brennan 9fad21c498 Recursive remove by default. 2012-07-14 14:12:15 -04:00
Brian J Brennan 56fd961fc8 Add to readme 2012-07-14 14:07:58 -04:00
Brian J Brennan df853d1c5b Add git-obliterate for removing file from history. 2012-07-14 14:04:26 -04:00
TJ Holowaychuk 2dc7ff9793 Update master 2012-07-10 06:18:27 -07:00
TJ Holowaychuk 394c2c074b Merge pull request #124 from agrimaldi/patch-1
Fix screencast link
2012-07-10 06:01:01 -07:00
Alexis GRIMALDI a546165861 Fix screencast link 2012-07-10 08:56:01 +03:00
TJ Holowaychuk 126bff7b20 screencast link 2012-07-09 19:36:49 -07: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
TJ Holowaychuk 834a43c1bb Merge pull request #122 from jespino/git-effort-with-dash
Fixed 2 bashism and now works on bash and dash
2012-06-28 17:02:36 -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 4e17ad4b69 Merge pull request #119 from jespino/adding-manpages
Adding delete-merge-branches, gh-pages, rename-tag and squash manpages
2012-06-28 12:40:19 -07:00
TJ Holowaychuk c10be63473 Revert "Removing a bashism from git-effort"
This reverts commit cb6c34bc26.
2012-06-28 12:34:10 -07:00
TJ Holowaychuk cf474ecb7a Merge pull request #118 from jespino/bug/bashism-in-git-effort
Bug/bashism in git effort
2012-06-28 12:33:09 -07:00
Jesús Espino cb6c34bc26 Removing a bashism from git-effort 2012-06-28 21:15:34 +02:00
Jesús Espino 82041039a5 Adding delete-merge-branches, gh-pages, rename-tag and squash manpages 2012-06-28 21:14:17 +02:00
Jesús Espino c2c50d4659 Merge remote-tracking branch 'upstream/master' 2012-06-28 09:03:14 +02:00
TJ Holowaychuk f6498e39f3 Merge pull request #117 from jespino/adding-manpages
Adding bug/refactor/feature man pages
2012-06-26 09:23:31 -07:00
Jesús Espino 50a0208f10 Adding bug/refactor/feature man pages 2012-06-26 11:04:30 +02:00
Jesús Espino 175b432eba Adding bug/refactor/feature man pages 2012-06-26 10:59:39 +02:00
Jesús Espino 479bdce215 Merge remote-tracking branch 'upstream/master' 2012-06-26 10:46:10 +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
TJ Holowaychuk 58b6270281 Merge pull request #116 from jespino/bug/rename-tag-without-shebang
Adding shebang to the rename-tag command
2012-06-20 08:37:22 -07:00
Jesús Espino a915f6bce2 Merge branch 'bug/rename-tag-without-shebang' 2012-06-20 12:11:58 +02:00
Jesús Espino 465eabef9b Adding shebang to the rename-tag command 2012-06-20 12:09:56 +02:00
TJ Holowaychuk d58c8cff42 Merge pull request #113 from muhtasib/git_info
Updated main documentation to include git-info
2012-06-16 13:20:34 -07:00
Leila Muhtasib e08ace3b46 Updated main documenation to include git-info 2012-06-16 16:16:34 -04: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
TJ Holowaychuk 868c6fb0ad Merge pull request #112 from muhtasib/git_info
Git info
2012-06-16 09:45:00 -07:00