utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-14 01:16:31 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
349 commits 5 branches 57 tags 6.1 MiB
Commit graph

201 commits

Author SHA1 Message Date
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
Leila Muhtasib 67a5be6cc9 git-undo now keeps file changes when undoing. 
Wiping out previous commits is error prone. Most people probably want to edit their
changes and commit again. Modified behavior so that when undoing a commit, changes
are left in the user directory unstaged.
 2012-06-10 23:38:48 -04:00
TJ Holowaychuk 2e53ff6091 Release 1.6.0 2012-06-04 13:51:13 -07:00
TJ Holowaychuk 37424606ba tweak update a bit 2012-06-04 13:48:38 -07:00
Wil Moore III b3cf0c8b3d Favoring the use of bash "Parameter Expansion" instead of "dirname" as 
"dirname" has some cross-platform challenges.

- removed the superfluous stderr redirection
- switched out dirname for param expansion
 2012-06-04 14:34:46 -06:00
Wil Moore III 0b71ff6797 Corrected git extras update where ${PREFIX} was not honored for make install 
- query for $PREFIX given location of `git-extras` script
- prefix `make install` with ${PREFIX} -- empty is given if $PREFIX not
  set allowing makefile to continue to use it's default in that case.
 2012-05-30 22:41:56 -06:00
TJ Holowaychuk f4936f4e23 git-release: removed "Prepared" 2012-05-11 09:47:49 -07:00
TJ Holowaychuk 785f546f68 Merge pull request #99 from creynders/master 
modified changelog and added rename-tag
 2012-05-03 10:46:55 -07:00
Camille Reynders 1914503d2f added switch -l as shortcut for --list to git-changelog 2012-05-03 19:27:58 +02:00
Camille Reynders 0e97b5f9a0 git-changelog accepts optional parameter to pass changelog output file 2012-05-03 19:24:43 +02:00
Camille Reynders b91534b234 fixed incorrect argument passing and added pushing to remote 2012-05-03 14:23:07 +02:00
Camille Reynders cfb0d15aad added git-rename-tag 2012-05-03 14:03:48 +02:00
TJ Holowaychuk a4905546c0 ocd 2012-04-29 10:33:31 -07:00
creynders 69140cec81 made git commit optional and added -a -m switches to tag 2012-04-28 14:29:47 +03:00
Marc Harter 148c89707e changelog pulls tags in reverse order 2012-04-19 21:16:57 -05:00
TJ Holowaychuk c7444a5674 Merge pull request #93 from wavded/master 
switch to printf instead of echo for git-changelog
 2012-04-19 09:27:13 -07:00
Marc Harter 059e01a864 switched to printf instead of echo 2012-04-19 11:15:38 -05:00