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

868 commits

Author SHA1 Message Date
Nimit Kalra 94556f380b Version 4.0.0 2015-12-28 22:42:20 -06:00
David Rogers 2b042bdd59 Better USAGE message 2015-12-28 14:07:09 -05:00
David Rogers 64639e1437 Touch multiple files supplied 2015-12-28 14:06:30 -05:00
David Rogers 3c874ce9f4 Use $@ instead of $* re #467 
Blind first pass so that I have a PR to remind me...
 2015-12-28 13:53:49 -05:00
Andrew Janke a09eefde25 Fix missing shebang in git-clear and missing +x on others 2015-12-27 15:02:55 -05:00
hemanth.hm 35e1f7845a Merge pull request #479 from JanSchulz/global_gitignore 
Add more info how to set global gitignore
 2015-11-03 07:47:46 +05:00
hemanth.hm 1d8534b9cd Merge pull request #448 from Lee-W/master 
Add git-ignore-io
 2015-10-28 10:15:40 +05:30
Jan Schulz b4f4dd1197 Add more info how to set global gitignore 2015-10-22 11:28:17 +02:00
Nimit Kalra b804d36a21 Merge pull request #471 from JanSchulz/merge-changelog 
git-changelog: option to only use merges
 2015-10-18 13:22:30 -05:00
Jan Schulz 5a80928b89 git-changelog: option to only use merges 
using `-m` or `--merges-only` will only show the merge
commit messages. It will also use the body of the merge
commit message in addition to the subject, as github merges
usually have a useless subject line for commit messages.

If used with `-n/--no-merges`, the last one specified will win.
 2015-10-18 16:11:10 +02:00
spacewander 7f662708fa use real purplish 2015-10-13 23:54:52 +08:00
hemanth.hm f799e96910 Merge pull request #466 from anarcat/master 
add simple sed command
 2015-10-10 09:43:36 +05:30
Antoine Beaupré 4b795fc42f add simple sed command 2015-10-08 16:13:27 -04:00
spacewander 77f1c86b0d disable color if the output is not printed to tty 2015-10-08 16:45:53 +08:00
spacewander 02a440953b replace wildcard '?' to literal '?' 
Previously the `?` in the case statement will match any single letter.
As a result, `git scp a` will act as the same as `git scp -h`.
What we actually need is a literal '?'.
 2015-10-08 14:06:46 +08:00
spacewander 7ae2e0b9ef git-scp: use portable terminal escape sequences 2015-10-08 10:24:31 +08:00
hemanth.hm c4cd2ca34d Merge pull request #460 from apjanke/summary-defensive-locale 
git-summary: protect against character encoding issues with LC_ALL=C
 2015-10-02 22:05:27 +05:30
Andrew Janke 19f66943cb git-summary: protect against character encoding issues with LC_ALL=C 2015-10-02 08:35:04 -04:00
Andrew Janke b2817c7299 git-effort: use portable terminal escape sequences 
Also uses "default color" instead of "black" for the low-activity things, so
it still shows up on colorschemes that have dark backgrounds.
 2015-10-02 06:35:38 -04:00
Johannes Ewald 7b74567550 Add possibility to also checkout pull requests based on GitHub urls 2015-09-24 16:11:06 +02:00
Akim Demaille 5f61bfad6e summary: beware of locale issues, and pass options to line-summary 
* bin/git-summary: here.
 2015-09-23 19:27:19 +02:00
hemanth.hm 332bec0f1a Merge pull request #443 from Natim/patch-1 
Make sure git-authors doesn't return twice the same ones.
 2015-09-22 11:44:40 +05:30
LeeW 37d6012791 Replace "export" option with "replace" in git-ignore-io 2015-09-19 09:54:53 +08:00
LeeW 07505518fa Remove exclamation mark 2015-09-19 01:00:31 +08:00
LeeW 88c3437a24 Remove warning when search without word. 
* Show usage only
 2015-09-19 00:42:23 +08:00
LeeW b517022e15 Fix typo 2015-09-19 00:37:38 +08:00
LeeW 8d0eae5c7f Add warning when there is not argument after search, append and export 2015-09-17 21:32:10 +08:00
LeeW 61bfc44eec Fix ~/.gi_list not exist problem 2015-09-17 21:19:45 +08:00
Sam Thursfield 6a000ec99b effort, summary: Correctly estimate the number of active days 
The output of `git log` is not exactly in chronological order. The
default sort option (--date-order) is described in the man page as
follows:

    Show no parents before all of its children are shown, but otherwise
    show commits in the commit timestamp order.

The `uniq` program will only remove duplicate lines if they follow each
other. In order for this to work correctly, we need to ensure that the
list of dates is exactly in chronological order. There doesn't seem to
be a `git log` option to achieve this, but we can use the `sort`
program. I used reverse sort (`sort -r`) since the output will be roughly
reverse-sorted already.

It's also worth noting that the default --date-order option sorts by
commit date, but git-summary uses *author* date (%ai). Passing
--author-date-order doesn't fix this issue, though, so I didn't change
that.

At the time of writing, this change reduces the number of 'active days'
for git-extras.git from 367 to 331.
 2015-09-14 13:32:10 +01:00
hemanth.hm c8aca55cd7 Merge pull request #445 from nicolaiskogheim/straighten-up-effort 
Straighten up effort
 2015-09-14 14:55:54 +05:30
Nicolai Skogheim 80f060b213 effort: change order of arguments to function 
This makes git effort less prone to failing if
someone passes formatting options
 2015-09-14 00:00:39 +02:00
Nicolai Skogheim e91fd9623f effort: add usage message 2015-09-13 23:56:56 +02:00
Nicolai Skogheim 86e1a7014c effort: More robust argument parsing 
Why:

* The old way of handling arguments could make it
difficult to make non-breaking changes because
to be able to handle more arguments than the
'--above' argument, the logic would need to be heavily
refactored and demand restrictions on argument order.

This change addresses the need by:

* Parse arguments in a cleaner way
* Make the command more future proof with respect to arguments

Notable change is the synopsis. Please the see man page.
 2015-09-13 23:55:28 +02:00
LeeW 490d12b6f7 Add full name for list option 2015-09-12 08:15:29 +08:00
LeeW 0393d560f8 Fix usage error 2015-09-12 08:04:47 +08:00
Rémy HUBSCHER 639210660e Make sure git-authors doesn't return twice the same one. 2015-09-11 20:14:36 +02:00
spacewander 38c7b03372 add alias to git-feature 2015-09-11 20:23:17 +08:00
LeeW 2c1d766640 Modify print_last_modified_time to make it Linux compatible 2015-09-09 18:42:28 +08:00
LeeW 6073594656 Remove redundant \n in tr 2015-09-08 20:59:08 +08:00
LeeW fed97bf8db Not to update list each time git-ignore-io is executed 
* Check whether the list exists. If not, get it.
* Update should use -u option manually
 2015-09-08 20:57:06 +08:00
LeeW 3ad2f6fa4a Refactor git-ignore-io and remove .gitignore 2015-09-08 20:23:53 +08:00
spacewander a7f830b1e7 remove duplicate checkout 2015-09-08 16:08:50 +08:00
LeeW 98bbfe7968 Fix typo 2015-09-07 22:20:20 +08:00
LeeW 4a8037fa62 Implement search function or git-ignore-io 2015-09-06 22:49:32 +08:00
LeeW d87599c344 Remove help from git-ignore-io 2015-09-06 22:18:29 +08:00
LeeW 87d61693b1 Merge gi_extension project into git extras as git-ignore-io 
* gi_extension(https://github.com/Lee-W/gi_extension)
 2015-09-06 19:58:17 +08:00
grindhold a66c9446b5 made more precise security-question. 2015-09-01 15:17:14 +02:00
grindhold dae38840f9 more concise implementation of git-clear 2015-09-01 13:28:29 +02:00
Nicolai Skogheim 0c7bf665f2 Fix typo in variable name 2015-08-29 15:31:10 +02:00
grindhold ad7811e991 implemented git-clear 
i wanted a simple command to restore the state of a repo as if it was
freshly cloned with the current HEAD. This is basically git reset --hard
with deletion of all untracked files that are in the repo.
 2015-08-26 21:58:22 +02:00
hemanth.hm afb905c5ae Merge pull request #430 from spacewander/git-extras 
make it possible to update via `git extras`
 2015-08-16 09:28:41 +05:30
luozexuan 5fb7f6b77c make it possible to update via git extras 2015-08-16 11:47:16 +08:00
hemanth.hm ad83e447a6 Merge pull request #429 from nicolaiskogheim/merge-into-ff-only 
merge-into: change --ff option to --ff-only
 2015-08-14 17:12:05 +05:30
Nicolai Skogheim 2d8b703e7c merge-into: change --ff option to --ff-only. fix #421 2015-08-14 13:03:39 +02:00
hemanth.hm 17b82ec9ee Merge pull request #411 from Natim/add-psykorebase-command 
Add the git-psykorebase command.
 2015-08-11 16:02:39 +05:30
Rémy HUBSCHER 84699acc6e Add documentation. 2015-08-11 11:26:52 +02:00
hemanth.hm 3632ad959f Merge pull request #426 from spacewander/update-for-new-version 
abort git-alias when too many arguments given.
 2015-08-09 17:21:42 +05:30
spacewander 98a1820d39 abort git-alias when too many arguments given. 
Avoid incorrect usage probably because of the missing quotes, like "git
alias cm checkout master"
 2015-08-09 19:27:49 +08:00
hemanth.hm ad75f873af Merge pull request #423 from nicolaiskogheim/effort-paths 
effort: document that it takes any path, not just filenames
 2015-08-08 20:46:25 +05:30
Nicolai Skogheim 4527656f7c effort: rename 'file' to 'path' to be more accurate 2015-08-08 09:06:54 +02:00
Nicolai Skogheim 7de280f12f effort: fix active days always 1 
Introduced in cdb773c06 (Fix error on FreeBSD with process substitution)
when trying to squash a bug.
This fix should be valid for that bug as well.
 2015-08-08 02:44:55 +02:00
hemanth.hm 2113e8c1d7 Merge pull request #419 from nicolaiskogheim/git-guilt 
[RFC] guilt: small fixes
 2015-08-07 16:43:09 +05:30
Nicolai Skogheim ff4ad92a7a line-summary: 'function f{...' -> 'f() {...' 
We use this style more often
 2015-08-07 08:36:56 +02:00
Nicolai Skogheim 40023f9f14 line-summary: add missing quotation marks 2015-08-07 08:36:56 +02:00
Nicolai Skogheim b9ca124980 line-summary: tighten regex 2015-08-07 08:36:56 +02:00
Nicolai Skogheim 8b4e50f74a guilt: remove --help option 
git overrides execution when --help is given,
showing the man page for the command
 2015-08-07 08:35:32 +02:00
Nicolai Skogheim 8f1729d5f7 fork: http-urls had colon instead of slash 2015-08-05 04:27:32 +02:00
spacewander 94bf129721 now we can specify a commit range for git-obliterate 2015-08-01 20:39:02 +08:00
Rémy HUBSCHER d8395ba2e9 Create a bash version of git-psykorebase — Fixes #411 2015-07-31 16:22:58 +02:00
hemanth.hm 3c5523617e Merge pull request #409 from nicolaiskogheim/refactor-alias 
Refactor alias
 2015-07-29 17:51:23 +05:30
Nicolai Skogheim 24ad1c8281 alias: bugfix 
'git alias <search-term>' did not work.
 2015-07-29 13:15:34 +02:00
Nicolai Skogheim 4b4276e3fc contrib: refactor, and conform to git 2015-07-29 12:03:45 +02:00
hemanth.hm 371dcdff13 Merge pull request #405 from nicolaiskogheim/fix-filenames-with-spaces 
Make git effort not crash when passed file names with spaces
 2015-07-29 13:36:24 +05:30
hemanth.hm 46db56905d Merge pull request #404 from nicolaiskogheim/freebsd-fix 
Make git effort run on FreeBSD
 2015-07-29 13:36:00 +05:30
NANRI 22406cef6a git-alias: use sed insted of colrm 
PortableGit doesn't have colrm command.
 2015-07-29 08:39:07 +02:00
NANRI 5e14c08fc5 git-changelog: use cp instead of mv 
mv command cannot overwrite in PortableGit(msysgit).
 2015-07-29 08:27:30 +02:00
NANRI 434b7681ce git-extras: use git-help instead of man 
PortableGit doesn't have man command.
 2015-07-29 08:23:25 +02:00
Nicolai Skogheim 526fb77823 Quote variables bc of filenames with spaces 2015-07-29 05:10:52 +02:00
Nicolai Skogheim 1956d385bd Guard against 'seq 0' 
Most implementations of seq yields no output for 'seq 0',
but some yields '1(newline)0'.
 2015-07-28 21:23:50 +02:00
Nicolai Skogheim cdb773c065 Fix error on FreeBSD with process substitution 2015-07-28 20:41:53 +02:00
Nicolai Skogheim 20e6455559 Pass --import-functions if required 
This patch is the reason for this commit:
https://lists.freebsd.org/pipermail/svn-ports-all/2014-September/075090.html
 2015-07-28 06:13:59 +02:00
hemanth.hm f40e6c37a6 Merge pull request #401 from nicolaiskogheim/effort-above-error-on-NaN 
effort: error out on bad value to --above
 2015-07-25 13:05:00 +05:30
Nicolai Skogheim 6ebfdc5329 effort: error on bad value to --above 2015-07-25 09:09:39 +02:00
hemanth.hm d97faf2424 Merge pull request #400 from nicolaiskogheim/fix-off-by-one 
effort: don't count untouched files
 2015-07-25 12:17:34 +05:30
hemanth.hm 651a2bac97 Merge pull request #391 from nicolaiskogheim/effort-limit-commits 
[RFC] effort: Allow sending options to log. Fix #326
 2015-07-25 11:52:06 +05:30
hemanth.hm 3dcf09f883 Merge pull request #398 from nicolaiskogheim/git-graft 
graft: Require destination branch. Fix #23
 2015-07-25 11:50:43 +05:30
Nicolai Skogheim 95db4e7ad5 archive-file: cleaner way to get current branch 2015-07-25 06:09:43 +02:00
Leila Muhtasib 3d0b4feb80 graft: Require destination branch. Fix #23 
This is to avoid the old behaviour of automatically
merging into master.
 2015-07-25 04:16:09 +02:00
Nicolai Skogheim 329106c845 effort: don't count untouched files 2015-07-25 03:16:18 +02:00
Nicolai Skogheim ba5e5989a3 Do proper argument parsing 2015-07-24 18:57:34 +02:00
Nicolai Skogheim fd72edd98f effort: allow sending options to log. Fix #326 2015-07-23 01:15:10 +02:00
Amir Tocker 7ddd1f7a60 Catch "HEAD -> master" when creating the changelog 
git log may report `(HEAD -> master, tag:...)` instead of `(HEAD, tag:...)`.
 2015-07-20 09:38:14 +03:00
hemanth.hm 8652172f9b Merge pull request #394 from markeissler/changelog-signal-trap 
Handle signals in git-changelog.
 2015-07-16 09:25:45 +05:30
Mark Eissler 4ff5dc1ee0 Remove unused var. 2015-07-15 08:34:06 -07:00
Mark Eissler 4fd095b741 Handle signals in git-changelog. 2015-07-10 18:11:18 -07:00
Nicolai Skogheim a7064395c2 Meke coloring respect --above. Fix 74 2015-07-10 03:29:09 +02:00
Nicolai Skogheim 935c5a37b3 Avoid spawning subshell 2015-07-08 18:59:10 +02:00
Nicolai Skogheim 39238ded46 Remove unnecessary call to cat 2015-07-08 18:56:00 +02:00
Nicolai Skogheim 203b7649a2 perf: reduce calls to git log 2015-07-08 18:52:51 +02:00
Nicolai Skogheim 73973049d6 Parallelize git-effort with xargs 2015-07-08 18:45:41 +02:00
Nicolai Skogheim cb15c94eab Alter options to git log. Remove pipe 2015-07-08 17:58:12 +02:00
Rico Sta. Cruz 13842de9e0 Use https for git-fork 2015-06-23 12:57:30 +08:00
spacewander 51fbc16913 installation with curl and bash 2015-06-08 00:09:40 +08:00
spacewander 84c2d1014b keep installation silent 2015-06-07 20:57:39 +08:00
spacewander a498332c96 update installation in git-extras update 2015-05-30 12:31:23 +08:00
go2null a67b42711d FIXes location of -- for grep 
Broken in 5b1ac3ccc6

`--` must be after all parameters (options), and before positional arguments

See https://unix.stackexchange.com/questions/11376/what-does-double-dash-mean-also-known-as-bare-double-dash
 2015-05-28 11:59:29 +00:00
phigoro 95e8812370 git-effort: replace "wc | cut" with "wc | awk" 
It looks "cut" may have different behaviour, e.g. BSD one works the way
git-effort doesn't expect. "awk" looks to be one of possible fixes here.
 2015-05-11 19:54:38 +03:00
phigoro 09d967dfbd align hashbang of git-guilt & git-merge-into 2015-05-10 12:01:38 +03:00
Newell Zhu 72f08b1095 Fix Fatal for git-line-summary 
1. Fix print format with special characters
2. Fix Fatal when exist special characters in git blame output
3. Fix raise error when exist not committed new files
 2015-05-09 17:07:29 +08:00
Rob Kennedy e2b6eaf028 Don't treat ignored patterns as regexps 
Fixes #353.
 2015-04-29 22:48:16 -07:00
Hemanth.HM 438de98926 Version 3.0.0 2015-04-27 17:43:50 +05:30
CJ 62dd4a2258 Updated documentation for git-scp and slight feature change 2015-04-27 15:05:17 +08:00
Mark Eissler 399bc037fa Fix git tag substring extraction for bash 3.2. 2015-04-25 10:12:17 -07:00
hemanth.hm e16e90e9b9 Merge pull request #360 from spacewander/master 
correct the broken regex
 2015-04-25 21:44:15 +05:30
spacewander 2810323aad add support for git version below 2.2.0 2015-04-24 12:00:17 -07:00
Mark Eissler 80d680b0a6 Fix git-changelog for compatibility for bash<4. Fixes #337, #338 
Removed dependency on real associative arrays, which are not
support previous to bash 4.
 2015-04-24 12:00:17 -07:00
spacewander b4a1fe0aa3 correct the broken regex 
'*text' only matches string ended with 'text'. So it matches 'ASCII text',
but does not match 'ASCII text executable'. Before, `git summary
--line` just counts plain text file, now we fix it.
 2015-04-24 23:13:16 +08:00
Ivan Malopinsky 05b0a5d3d5 git-merge-repo 2015-04-19 12:23:02 -04:00
spacewander b375870693 fix indentation errors in git guilt 2015-04-12 11:22:55 +08:00
spacewander b109c866b7 Hope to fix #341 2015-04-10 00:58:59 +08:00
Kylie McClain 5b1ac3ccc6 use argument separator for usages of grep which can choke on weird input 2015-04-08 18:51:30 -04:00
spacewander 888919c2e9 add git-guilt 2015-04-06 15:59:53 +08:00
spacewander 3330af6cd4 sort unless there is only one item 2015-03-22 22:55:15 +08:00
hemanth.hm 1a25e57069 Merge pull request #333 from paulschreiber/merged-branches 
Fixes #332 git show-merged-branches and show-unmerged-branches
 2015-03-18 19:12:08 +05:30
Paul Schreiber 00050b91da add show-merged-branches and show-unmerged-branches 2015-03-18 09:33:02 -04:00
Paul Schreiber 668cc9ef78 when deleting merged branches, preserve "svn" branch for git-svn 
Fixed #328
 2015-03-17 14:00:40 -04:00
hemanth.hm 9b50ce3000 Merge pull request #324 from chernjie/git-ignore 
Support ~ in git-ignore.
 2015-03-17 13:24:23 +05:30
Mark Eissler fbe171e280 Fix tag trapping when HEAD and tag point to same commit. 
When the last tag is also the last commit, then we need to account
for a much longer tag output:

  HEAD, tag: v1.0.1, origin/master, origin/HEAD,...

This fix strips out 'HEAD', the rest is handled by existing code.
 2015-03-16 13:37:53 -07:00
Mark Eissler 29cd63bea2 Fix gitflow commit history output. 
When gitflow is used, commits on merged feature branches were
appearing in the generated output with tags labeled as:

  origin/feature/BRANCH_NAME

This fix filters out any 'tags' that include forward slashes,
which eliminates this behavior. The commits then appear as part
of the tag they were merged in with.
 2015-03-16 12:16:10 -07:00
Mark Eissler 49e8cf17a4 Complete rewrite to support commit ranges for pretty and list output. 2015-03-11 11:43:35 -07:00
CJ 522213a28f Support ~ in add_patterns for git-ignore 2015-03-11 15:00:30 +08:00
CJ bf89063212 Support ~ in show git-ignore 2015-03-11 15:00:24 +08:00
spacewander d94663312f add merge-into to merge two branches quickly 2015-03-10 23:45:00 +08:00
Andrew Starr-Bochicchio 28df09b103 git-fresh-branch: Check for changes and prompt for input before nuking. (Issue: #142) 2015-03-09 22:14:37 -04:00
hemanth.hm 14ef2a88ef Merge pull request #308 from spacewander/git-utility 
extra mktemp into git_extra_mktemp.
 2015-03-08 23:37:20 +05:30
hemanth.hm a48402153b Merge pull request #312 from RichardLitt/feature/concat-extra-feature-names 
Added in option to concat extra feature names.
 2015-03-08 23:36:41 +05:30
Ciro Nunes c1b0067a97 fix gh-pages to stash and don't delete files 
Closes #137
 2015-03-03 09:04:20 -03:00
Jianjin Fan 6df9673936 Allow empty initial commit when setup repo. 
When hit `git setup` in an empty directory, it doesn't create a commit. But often we need an empty initial commit for future rebasing and reseting, etc. Fixes #318.
 2015-02-20 12:25:25 +08:00
jykntr bfeb897a6d git-summary correctly displays project name 
git-summary correctly displays project name when not executed in the top
level directory of a repository.  Fixes tj/git-extras#302.

Uses the git-sh-setup script to find top level directory and then uses
that directory name for the project name.
 2015-02-18 17:09:39 -07:00
Damian Krzeminski fabb2c5541 changelog: add git-config support for format and log options 
(1) make format configurable

you can change the default changelog format by configuring
changelog.format git variable

for example:

  git config changelog.format '- %s (%ae)'

gives you something like that:

  - Merge pull request #298 from timfeirg/master (hemanth.hm@gmail.com)
  - remove stuff from readme & form a list (kkcocogogo@gmail.com)

see git-log man for more examples

(2) make log options configurable

set `changelog.opts` to influence the way changelogs are generated

    git config changelog.opts --no-merges

or:

    git config changelog.opts --first-parent

fixes #285

also:
- delay calculating HEAD until needed
- remove extra line before header
 2015-02-15 22:40:24 -05:00
Damian Krzeminski a86d850688 use standard git editor in git-authors & git-changelog 
The editor used will be chosen from the GIT_EDITOR environment variable,
the core.editor configuration variable, the VISUAL environment variable,
or the EDITOR environment variable (in that order).

That ensures that `git-changelog` and `git-authors` will use the same editor
as `git-commit`, `git-merge` etc.
 2015-02-13 17:51:22 -05:00
Riceball LEE 48eb195ee0 + custom commit message options supports 2015-02-12 17:55:31 +08:00
hemanth.hm 83b9348c91 Merge pull request #300 from chernjie/git-scp 
git scp - Copy files to SSH compatible `git-remote`.
 2015-02-11 13:47:01 +05:30
Richard Littauer b1a790b851 Added in option to concat extra feature names 
This takes any extra arguments supplied to `$git feature` and sets
them as the new feature name. For instances, instead of throwing an
error if `$git feature new thing` is called, it will create branch
`feature/new-thing`.
 2015-02-10 16:02:39 -08:00
hemanth.hm ced7ec0c97 Merge pull request #310 from imsky/git-delta 
Added `git-delta`.
 2015-02-10 09:45:54 +05:30
Ivan Malopinsky e7b371b355 git-delta 2015-02-09 21:09:11 -05:00
wooorm b0a6d04f9f Add git-authors 2015-02-07 17:24:21 +01:00
spacewander 32aee50bc6 extra mktemp into git_extra_mktemp 
now we can put all utility functions to git-extra-utility
 2015-02-05 14:22:49 +08:00
Chris Hall a36b7f4934 adding git-chore 2015-02-04 11:52:23 -05:00
spacewander e1cedf7fd2 add enough X to fix #303. 
GNU mktemp requires at least three X in the last part of template.
 2015-02-02 21:35:44 +08:00
wooorm 1199186652 Fix typo in in git ignore message 2015-01-23 11:58:38 +01:00
CJ 195fb17458 symlink git-rscp to git-scp 2015-01-19 12:27:56 +08:00
hemanth.hm e738f760ae Avoid duplicating asterisk. 
Closes https://github.com/tj/git-extras/pull/218
 2015-01-18 22:10:39 +05:30
Jon Ander Peñalba bfd38ca891 When deleting a branch check if git has config. 
Don't assume that the remote is always origin and that the
remote branch name is the same as the local one
 2014-12-17 11:33:09 +01:00
CJ 73d5209743 adapted a more generic, customizable and friendly script 2014-12-16 21:26:18 +08:00
CJ 399073af7b Copy from git-goth https://github.com/chernjie/git-goth 2014-12-16 20:12:06 +08:00
hemanth.hm 081e14f88f Merge pull request #226 from tsldh/master 
Added changelog -c flag to git-release.
 2014-12-07 10:49:24 +05:30
David Hartmann 292586d96f added changelog to release as optional flag 
- rewrote the flags to contain multiple
- added -c as changelog option
 2014-12-06 14:43:34 -05:00
Matthew Avant 7701ba4069 Use mktemp for temporary file creation. 2014-12-04 11:01:40 -08:00
dead-horse 9a9be49b63 make release hook more flexible 2014-12-03 00:57:41 +08:00
Ben Parnell 0b0b688c17 added --no-color to git-delete-merged-branches 2014-12-01 10:20:26 +00:00
hemanth.hm 7b7913fab1 More portable she-bangs. 2014-11-30 17:47:26 +05:30
Dan Jackson d7d6ff2fed Use process-specific tmp file and clean up on exit 
Fixes #279 using the suggestion from @hemanth, with some minor tweaks:

- I kept the leading . because I figured there was a reason it was put there originally.
- Changed the show_cursor method that's called when the process exits (prematurely or naturally) to be show_cursor_and_cleanup, and added a line to it that cleans up the tmp file.
 2014-11-26 10:23:54 -08:00
Valérian Galliat 5ee706b585 git-info: POSIX compliance 
Replace `echo -n` (non-POSIX) with an helper function `echon` echoing a
newline after given expression.
 2014-11-26 14:02:29 +01:00
hemanth.hm 53e4f3c89d Fixes #277 2014-11-21 00:31:43 +05:30
hemanth.hm e7990ed810 Merge pull request #276 from spacewander/master 
git-ignore will cd root to find .gitignore.
 2014-11-21 00:27:09 +05:30
Hemanth.HM cb0e56639c Version bump. 2014-11-18 21:37:03 +05:30
spacewander 0374044790 modify the behavior of git-ignore, now it will cd root to find .gitignore 2014-11-17 21:36:56 +08:00
spacewander 92c34e8e00 add new command 'git root' to show the path to root of repo 2014-11-13 16:12:50 +08:00
hemanth.hm 1748fb29c5 Merge pull request #271 from bohnman/git-rename-tag-fix 
tag to tags
 2014-11-08 11:14:59 +05:30
spacewander 76e0dfef97 replace visionmedia/git-extras to tj/git-extras 
Although Github reserves the 'visionmedia' user space(a visit to there
will be redirected to 'tj'), it's better to
rename the links from visionmedia/git-extras to tj/git-extras
 2014-11-06 17:12:01 +08:00
Ryan Bohn 53efa98c15 changing incorrect reference of tag to tags 2014-11-05 15:29:48 -05:00
Kevin Woo 6d7f10c0c6 added git-locked to check what files have been locked 2014-10-16 20:53:47 -05:00
Guillaume Seren db0f610bc1
Fix #267, git-missing did not catch branch name. 
It was a bug on my setup, the test did no detect the
branch name, so I change:
if [[ $arg != -* ]]; then
by
if [ -n "${arg}" ]; then

According to test man page, -n:
«True if the length of string is non-zero.»

I also added quote and {} around the param,
to prevent bash expension around strange char.
 2014-10-14 16:24:18 +02:00
hemanth.hm 3c7d4e67f4 Version 2.1.0 2014-10-13 17:51:54 +05:30
hemanth.hm e294617d10 Fixes #266 2014-10-13 17:49:34 +05:30
hemanth.hm daf0c0c048 Merge pull request #263 from Yitsushi/bug/180-does-not-check-out-branch-if-it-already-exists 
fix #180 and #232 feature|bug|refactor checkout.
 2014-10-07 17:27:55 +05:30
Balazs Nadasdi b9478d64b7 fix #180 and #232 feature|bug|refactor checkout 
If branch creation in feature|bug|refactor returns a non-zero value
then simply try to switch to branch
 2014-10-07 10:57:00 +02:00
Rico Sta. Cruz ab67327ec0 Implement git-pr 2014-10-07 13:13:19 +08:00
Sasha Khamkov ccf029dabe FIX: representation of git-info 
- fix representation of `git-info` output

$ git info --no-config

Before:

 ## Remote URLs:\n
 origin	https://github.com/sanusart/git-extras.git (fetch)
 origin	https://github.com/sanusart/git-extras.git (push)
 upstream	https://github.com/visionmedia/git-extras.git (fetch)
 upstream	https://github.com/visionmedia/git-extras.git (push)\n
 ## Remote Branches:\n
   origin/HEAD -> origin/master
   origin/fix_feature_refactor_bug
   origin/gh-pages
   origin/issue234
   origin/master
   origin/patch-1
   upstream/gh-pages
   upstream/master\n
 ## Local Branches:\n
 * master\n
 ## Most Recent Commit:\n
 commit ac18bd16b4
 Merge: 68455cf a1b7120
 Author: hemanth.hm <hemanth.hm@gmail.com>

     Merge pull request #260 from brandondrew/patch-1\n
 Type 'git log' for more commits, or 'git show <commit id>' for full commit details.\n

After:

git info --no-config

## Remote URLs:

origin	https://github.com/sanusart/git-extras.git (fetch)
origin	https://github.com/sanusart/git-extras.git (push)
upstream	https://github.com/visionmedia/git-extras.git (fetch)
upstream	https://github.com/visionmedia/git-extras.git (push)

## Remote Branches:

  origin/HEAD -> origin/master
  origin/fix_feature_refactor_bug
  origin/gh-pages
  origin/issue234
  origin/master
  origin/patch-1
  upstream/gh-pages
  upstream/master

## Local Branches:

* master

## Most Recent Commit:

commit ac18bd16b4
Merge: 68455cf a1b7120
Author: hemanth.hm <hemanth.hm@gmail.com>

    Merge pull request #260 from brandondrew/patch-1

Type 'git log' for more commits, or 'git show <commit id>' for full commit details.
 2014-10-06 21:59:53 +03:00
Sasha Khamkov 293119cf6c Bump version in bin/git-extras 
- Bump version to 2.0.0 in `bin/git-extras` to enable updating package
via `git-extras update`
 2014-09-21 09:55:56 +03:00
spacewander 5f35004d08 add welcome in git-repl 2014-09-13 20:56:36 +08:00
meza be5362b025 Added option to specify base 2014-09-11 13:10:01 +01:00
Sasha Khamkov b94fdd11c2 ADD: git-reset-file 
Reset single file to HEAD or certain commit-hash

- add git-reset-file
- add respective man files
 2014-08-27 10:42:58 +03:00
hemanth.hm 8127f10640 File perms fix. 2014-07-30 17:57:47 +05:30
hemanth.hm 9bc92e65c2 Merge pull request #242 from sanusart/fix_feature_refactor_bug 
Fix feature|refactor|bug testing argument for string length.
 2014-07-25 08:39:48 +05:30
Sasha Khamkov ba481f35c2 Revert 2 commits to git-changelog 
- Revert "FIX: check if un-pushed commits". This reverts commit bd80a4e512.

- Revert "Add check for no changes in the tree (no sub-modules)". This reverts commit f2a41c54b1.

Resolves #234
 2014-07-24 20:57:07 +03:00
Sasha Khamkov 3d8db9dbb9 Fix feature|refactor|bug testing argument for string lenght 
93d92ae338 (diff-dde525a12e9f5e19)

Seems only works while $2 is quoted, e.g. "$2"

Closes #241
 2014-07-24 10:28:51 +03:00
Evan Grim 36596a33b3 Exempt master from deleted branches 
This is helpful for those who use the `git-flow` branch model and might
be surprised to find that this script deletes their master branch.
 2014-07-21 23:05:30 -05:00
Bruno Sutic b2576adae0 Refactor and improve git squash 
`git squash` refactor:
- first argument can be a branch or a commit reference
- the `--me` argument is not required anymore
- use `git reset --soft` is squashing on a current branch
- if squashing on master branch, prompt for confirmation
- does not delete provided branch after squashing
- fix bug: if `git merge --squash` command fails, exit script

Update README and man pages.

Fixes #95
Closes #198
 2014-07-20 17:33:15 +02:00
Andy 2024744f2b add git-fork 
update git-fork to add remotes refs as ssh

change fork source remote name to upstream

add man page for git-fork
 2014-07-15 10:11:44 +01:00
Joshua Appelman 04c43430aa Uses column -t to align summary output in a table. 2014-07-14 16:49:48 +02:00
hemanth.hm be12410e31 Merge pull request #221 from zlx/feature/git-summary-doc 
Make line-summary as sub-command.
 2014-07-14 20:01:20 +05:30
hemanth.hm 04d9deceb2 Merge pull request #224 from StewartJarod/patch-1 
Letter spacing in author list.
 2014-07-14 19:53:52 +05:30
hemanth.hm bbcaf7c324 Merge pull request #189 from rhacker/patch-1 
Add comment for the code.
 2014-07-13 20:57:28 +05:30
Sasha Khamkov bd80a4e512 FIX: check if un-pushed commits 
- switch the check for un-pushed commits from `diff-index` to more simple check
- still ignores sub-modules

Closes #234

Clarification: 
As pointed by @cristiandouce in #234 - my flow was different (and pretty stupid to be honest on some particular project of mine) so some other work flow scenarios was failing to pass. 

I still feel such check is needed, because it is still populates Changelog|History files with empty lines if no un-pushed commits exist, so @hemanth merge this one or revert the [619232e](619232ef86)
 2014-07-11 23:43:12 +03:00
Julio Napurí 08cdb7effb git-unlock Unlock local files in git repository 2014-07-10 11:27:58 -05:00
Julio Napurí 732ec9638f git-lock Lock files in git repository 2014-07-10 11:27:57 -05:00
Niklas Fiekas 3bd1b84759 Add git-rebase-patch 2014-07-10 09:54:17 +02:00
hemanth.hm b200552c90 Merge pull request #181 from zeroDivisible/feature/handle-misspellings 
git bug|feature|refactor accepts a single argument if not finishing.
 2014-07-09 11:13:02 +05:30
hemanth.hm 74acf8cab4 Merge pull request #193 from pzelnip/git-setup-no-overwrite 
`git-setup` checks for an existing .git in target dir.
 2014-07-09 11:01:42 +05:30
hemanth.hm 128bc2d5f8 Merge pull request #183 from chernjie/master 
`git-create-branch`: use HEAD instead of origin.
 2014-07-09 10:58:10 +05:30
hemanth.hm 619232ef86 Merge pull request #220 from sanusart/master 
Add check for no changes in the tree (no sub-modules)
 2014-07-09 10:56:25 +05:30
hemanth.hm 1a6cbf2433 Merge pull request #63 from justone/git_missing 
Adding `git-missing` command.
 2014-07-09 10:48:17 +05:30
hemanth.hm 0353b63e63 Merge pull request #216 from stephenmathieson/fix/changelog-large-versions 
Changelog formatting for large version numbers.
 2014-07-08 08:54:40 +05:30
hemanth.hm ab5c0364f6 Merge pull request #188 from twolfson/dev/add.multi.delete.squashed 
Added multi-delete for git-delete-branch and git-delete-tag.
 2014-07-07 18:04:11 +05:30
hemanth.hm 47bb6e0f74 Merge pull request #222 from jsipprell/pull/filenames-containing-spaces 
git-effort handles filenames with whitespace.
 2014-07-06 12:36:08 +05:30
hemanth.hm 039bb5c318 Merge pull request #223 from mwoc/master 
Restoring debian changelog compatibility.
 2014-07-06 12:34:21 +05:30
hemanth.hm a87403b57f Merge pull request #229 from yggdr/master 
/usr/bin/env for portability.
 2014-07-06 11:55:00 +05:30
eszabpt 698d027a0a Make git-obliterate work if there are whitespaces in filename 2014-07-04 11:16:17 +02:00
Konstantin Schukraft e4290dfb32 invoke bash via /usr/bin/env for portability 2014-07-02 09:41:37 +02:00
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
Jarod Stewart 374df5cabf Letter spacing in author list 
This is a quick fix for the letter spacing for the author list.
 2014-05-07 22:58:41 -06:00
Maarten Winter 0687de734c Use two-space indents for log entry output, so it again is debian changelog compatible (as before commit 1235e4a5) 2014-04-29 10:51:30 +02:00
Jesse Sipprell 1479b9633a
git effort: handle filenames containing whitespace cleanly 2014-04-22 20:21:10 -04:00
soffolk a4cf7462f0 Add line-summary as an options --line & doc 2014-04-22 21:50:22 +08:00
Sasha Khamkov f2a41c54b1 Add check for no changes in the tree (no sub-modules) 2014-04-06 00:10:08 +03:00
Stephen Mathieson fde9d1cd30 Fix changelog formatting for large version numbers 
This allows for version numbers which require more than 18 characters to
be underlined and pretty. :)
 2014-02-24 11:45:42 -05: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
Adam Parkin 2b6e35d5eb Address issue #190, git-setup should test for existing .git in target directory 
- now exits with an error message if the target directory already has a .git directory
 2013-10-01 13:26:55 -07:00
Dung Quang 62c8243ac5 Add comment for the code 
I think it's better that we have description in the file.
 2013-09-24 09:33:46 +02:00
Todd Wolfson 9b787421e7 Added multi-delete for git-delete-branch and git-delete-tag 
Correcting typos
Compiled latest documentation
Applying changes from delete-tag to delete-branch for consistency
Removed unnecessary string quotes (thanks `git` ref design) and everything works
Tags are not being found with string concatenation
Updated delete-tag to accept multiple tags
Corrections for delete-branch
Updating docs for delete-tag
Added 'Todd Wolfson' to AUTHORS
Updated documentation for delete-branch
Moved deletions to concatenate strings and delete in one fell swoop
Reworking delete-branch to delete multiple branches in series
 2013-09-15 14:40:35 -07:00
CJ e3320e2671 git-create-branch: bug fix for branch creation use HEAD instead of origin 2013-07-21 12:13:37 +08:00
zeroDivisible 93d92ae338 changed the code for git bug|feature|refactor to only accept single argument when not finishing a bug|feature|refactor. This is an easy solution to avoid misspelings of the word 'finish' 2013-07-18 14:33:41 +01:00
Nate Jones e5c8d79e66 allow options to be passed through to git log 2013-07-05 15:31:46 -07:00
Nate Jones 63d707c33c adding git-missing command 2013-07-05 15:31:46 -07: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
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
Michael Komitee 401e0a21e6 Added git-local-commits: script to show a log of all commits not pushed to origin 2012-03-31 16:15:00 -07:00
TJ Holowaychuk d79a310ed1 fixed git-repl conditional 2012-03-27 08:01:59 -07:00
nulltask 50e47e0be0 Added displaying current branch name to git-repl(1) prompt 2012-03-27 17:33:39 +09:00
TJ Holowaychuk 736ffc30bf Merge branch 'master' of github.com:visionmedia/git-extras 2012-03-26 15:20:14 -07:00
Dave James Miller 8fcabe34a3 Improvements to git-repl 
Fix history support by padding -e to read again, and forcing use of Bash instead of default shell (dash on Debian doesn't work).

Fix support of quotes in commands by using eval.

Don't show git help when pressing enter without typing a command.
 2012-03-26 15:19:36 -07:00
Mathieu D. (MatToufoutu) 361f47ce40 use https to clone in the automatic install script 2012-03-22 18:15:19 +01:00
TJ Holowaychuk bbd32d870a Release 1.5.1 2012-03-15 16:50:46 -07:00
Matt Colyer 226f58ab6f Fixes sorting issues with annotated and lightweight tags. 2012-02-29 17:25:47 -08:00
Tj Holowaychuk 1d839fdd15 Added active days to git-summary(1) (and refactored) 2012-02-09 10:15:48 -08:00
TJ Holowaychuk 54f3b65b68 Removed git-pull-request(1) 
not very useful since you have to lookup the number, in which case
you might as well just copy/paste the url and git am
 2012-02-09 08:09:20 -08:00
TJ Holowaychuk f07ca4b4d3 Merge pull request #65 from singingwolfboy/master 
fixes for packaging
 2012-02-09 00:18:15 -08:00
TJ Holowaychuk 738c784352 replace unsorted with sorted 2012-02-08 18:35:25 -08:00
TJ Holowaychuk a1ed706328 Added: sort git-effort(1) results. Closes #73 2012-02-08 18:17:13 -08:00
TJ Holowaychuk 643d20801b refactoring git-effort 2012-02-08 18:16:02 -08:00
Tj Holowaychuk 4db5ee02eb Release 1.4.0 2012-02-08 16:45:48 -08:00
Tj Holowaychuk f6e8cc6ecc Added: allow files to be passed to git-effort(1). Closes #71 2012-02-08 16:43:49 -08:00
Tj Holowaychuk 6aa2944727 Added: hide/show cursor for git-effort(1) 
since it looks really funny otherwise
 2012-02-08 16:40:26 -08:00
Tj Holowaychuk 38cba1a781 Changed: color git-effort(1) commits / active days independently 2012-02-08 16:35:47 -08:00
Tj Holowaychuk a75f6db5bc refactord git-effort(1) 2012-02-08 16:31:17 -08:00
David Baumgold 6fce92796c Modified git-pull-request to be able to create pull requests, as well as apply them 2012-02-08 15:30:46 -05:00
David Baumgold 5a15aea7ab Added git-gh-oauth: script to manage oauth keys for github 2012-02-08 15:30:11 -05:00
TJ Holowaychuk 9b0bc89eac Release 1.3.0 2012-02-08 08:19:57 -08:00
TJ Holowaychuk 3d8f8f340b Added active days to git-effort(1) output 2012-02-08 08:18:01 -08:00
TJ Holowaychuk be49961019 Release 1.2.0 2012-02-08 08:05:28 -08:00
TJ Holowaychuk 77ff0fe0d4 Added a greater color range to git-effort(1) 2012-02-08 08:02:30 -08:00
TJ Holowaychuk f07197c2cd use red instead of green 2012-02-08 08:00:50 -08:00
TJ Holowaychuk c2bd285ef8 ws 2012-02-08 07:59:57 -08:00
TJ Holowaychuk 9c7232afcf Added --above <n> to git-effort(1) 2012-02-08 07:59:19 -08:00
David Baumgold 6ae2ba17ff Merge branch 'master' of github:visionmedia/git-extras 2012-02-08 10:54:06 -05:00
TJ Holowaychuk c1d2dfc04c Release 1.1.0 2012-02-07 22:47:15 -08:00
TJ Holowaychuk a1ea7e3a32 Added git-effort(1) (not yet complete) 2012-02-07 22:40:37 -08:00
TJ Holowaychuk e7280f0305 refactored git-summary(1) 2012-02-07 22:18:45 -08:00
TJ Holowaychuk 4a56adb294 Release 1.0.0 2012-02-04 14:01:59 -08:00
TJ Holowaychuk 07d5ee82ff fixed git-squash 2012-02-04 13:59:07 -08:00
TJ Holowaychuk 1c62e436b7 changed git-squash(1) 2012-02-04 13:51:43 -08:00
Tj Holowaychuk 9dca3c36f6 Merge branch 'master' of github.com:visionmedia/git-extras 2012-02-01 13:07:27 -08:00
Tj Holowaychuk 902996edd2 Added git-squash 2012-02-01 13:07:14 -08:00
David Baumgold 3e3b4c918c Send error messages to stderr instead of stdout 2012-01-25 11:52:08 -05:00
TJ Holowaychuk 948308bbf0 Release 0.9.0 2012-01-15 13:26:23 -08:00
TJ Holowaychuk 40b131d9cc Release 0.8.1 2011-12-30 11:16:18 -08:00
Jonhnny Weslley b4fe82ffb4 track gh-pages branch 2011-12-26 14:04:59 -03:00
Jonhnny Weslley 7a632e9026 remove git-promote 
use the `-u` option instead:

    git push -u origin branch_name
 2011-12-26 14:04:45 -03:00
Tj Holowaychuk 391431d267 Release 0.8.0 2011-12-08 07:56:26 -08:00
Tj Holowaychuk c4e938d656 Added pre- post-release hooks to git-release 2011-12-08 07:55:29 -08:00
Jonhnny Weslley 7780038a39 Added git-promote 
Promotes a local topic branch to a remote tracking branch of the same name,
by pushing and then setting up the git config.

Thanks to ENTP:
http://hoth.entp.com/2008/11/10/improving-my-git-workflow
 2011-11-24 15:18:16 -03:00
Tj Holowaychuk 7a5833c88c merged 2011-11-09 20:14:27 -08:00
Tj Holowaychuk a5772a670c Removed git-apply-branch 
just realized --squash is pretty much this
 2011-11-09 20:13:19 -08:00
nulltask 24bef3da5a fixed: "git extra update" errors when pwd includes whitespace 2011-10-01 20:22:16 +09:00
Tj Holowaychuk 897ed16e6b Added git-apply-branch 2011-08-25 11:45:17 -07:00
Tj Holowaychuk 035668cde5 Release 0.7.0 2011-08-24 19:30:01 -07:00
Tj Holowaychuk 54b1eecd8e typo 2011-08-24 19:29:15 -07:00
Tj Holowaychuk 6a9fe62c7d Added percentages to git-summary 2011-08-24 19:28:57 -07:00
Tj Holowaychuk 3a82acaa8e Release 0.6.0 2011-06-24 11:16:39 -07:00
Kenneth Reitz e448ea7f06 new git-back command for soft undos 2011-06-17 09:01:39 -04:00
Tj Holowaychuk ac486037bf Release 0.5.1 2011-05-20 07:37:56 -07:00
Tj Holowaychuk b7222ed26e revert git-ignore but retain argc == 0 as showing .gitignore contents 2011-05-20 07:37:04 -07:00
Tj Holowaychuk 1f7edd9d24 revert broken git-release 2011-05-20 07:29:53 -07:00
Tj Holowaychuk 50169613f7 recursive install == bad 2011-05-19 14:53:54 -07:00
Tj Holowaychuk 2847dacabf added INSTALL check 2011-05-19 14:50:50 -07:00
Tj Holowaychuk 11ee5ed4f8 merge conflicts 2011-05-19 14:30:31 -07:00
Jonhnny Weslley 5117150a84 fixed typo error 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:47 -07:00
Jonhnny Weslley 758e8ce8b9 Use annotated tags to release commits instead of lightweight tags 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:47 -07:00
Jonhnny Weslley b8023be66a git-setup: create a directory if the provided one does not exist yet. Additionally, enables the creation of directories with names containing spaces in a more fashion way. Example: 'git setup path/to/repo name'. 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:47 -07:00
Jonhnny Weslley 954f3d5f45 git-ignore: show all availables templates if no patterns are found. 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:46 -07:00
Jonhnny Weslley e28c359a7a improved user feedback: show matched string using 'grep --color' 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:46 -07:00
Jonhnny Weslley 89e2047442 Fixes multiple matches selection 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:46 -07:00
Jonhnny Weslley a5392d54c3 git-ignore template support. Templates are based in https://github.com/github/gitignore 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:46 -07:00
Jonhnny Weslley 38d8a22589 git-ignore doesnt fail if .gitignore file dont exists yet 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-05-19 14:26:46 -07:00
Jonhnny Weslley 8c4cabd803 Merge branch 'master' of git://github.com/visionmedia/git-extras 2011-05-19 14:21:54 -03:00
Tj Holowaychuk a0de28fe07 Release 0.4.1 2011-04-05 13:22:46 -07:00
Tj Holowaychuk dcd1f2ecfe refactor git-graft 2011-04-05 13:20:41 -07:00
Kenneth Reitz 2d94afe185 git-graft now defaults to current branch instead of master 
Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
 2011-04-05 13:20:25 -07:00
Tj Holowaychuk 6de78f63f4 Release 0.4.0 2011-04-05 02:55:57 -07:00
Tj Holowaychuk aa6ec8fd7b Merge branch 'features' 2011-04-05 02:51:37 -07:00
Tj Holowaychuk 7d68c2bc7d Added git-refactor 2011-04-03 09:30:16 -07:00
Tj Holowaychuk 0b97430c8d Release 0.3.0 2011-03-29 08:58:43 -07:00
Tj Holowaychuk 28f52e69ee Added git-pull-request 2011-03-29 08:52:58 -07:00
Tj Holowaychuk 3315c8e19a Revert "Revert "Make sure to get the last chronological tag, instead of relying on the bogus git tag sorting."" 
This reverts commit f659f34375.
 2011-03-28 12:31:39 -07:00
Tj Holowaychuk f659f34375 Revert "Make sure to get the last chronological tag, instead of relying on the bogus git tag sorting." 
This reverts commit 27e8049fd7.
 2011-03-28 12:29:27 -07:00
Tj Holowaychuk c8dc5a8a19 Release 0.2.0 2011-03-27 09:07:27 -07:00
Tj Holowaychuk 9e5b89842b Added git-extras, removed git-extras-version and git-extras-update 2011-03-27 09:01:40 -07:00
Guillermo Rauch 27e8049fd7 Make sure to get the last chronological tag, instead of relying on the bogus git tag sorting. 2011-03-27 08:30:46 -07:00
Tj Holowaychuk 9a6324eab8 delete branch after merge 2011-03-23 17:29:26 -07:00
Tj Holowaychuk 5578905323 Added git-bug 2011-03-23 16:00:05 -07:00
Tj Holowaychuk a272211895 Added git-feature 2011-03-23 08:57:30 -07:00
Jonhnny Weslley f3fb2dda61 git alias 2011-03-15 23:13:07 -03:00
Jonhnny Weslley 8f9a69a969 Bump version 2011-02-22 17:12:39 -03:00
Jonhnny Weslley b74a9d7080 Added git-create-branch 2011-02-22 17:04:44 -03:00
Jonhnny Weslley 1a1a722527 removed git-ignore template support 2011-02-22 13:07:41 -03:00
Tj Holowaychuk a867eb0f5c Release 0.1.0 2011-02-10 20:26:00 -08:00
Tj Holowaychuk 2b692f861f Added gh-pages command 2011-02-10 20:25:25 -08:00
Jonhnny Weslley f235670a3e adopting uniq code style across multiple scripts: variables assignments, arguments validation and core logic. This style reduces if statements usage and makes code easier to understand. :D 2010-11-25 16:23:38 -03:00
Jonhnny Weslley 729b231f21 fixed typo error 2010-11-24 10:17:34 -03:00
Jonhnny Weslley 54fd21a755 Use annotated tags to release commits instead of lightweight tags 2010-11-24 10:16:53 -03:00
Jonhnny Weslley a14e95a727 git-setup: create a directory if the provided one does not exist yet. Additionally, enables the creation of directories with names containing spaces in a more fashion way. Example: 'git setup path/to/repo name'. 2010-11-10 16:26:26 -03:00
Jonhnny Weslley c909df34fc git-ignore: show all availables templates if no patterns are found. 2010-11-10 15:03:19 -03:00
Jonhnny Weslley 3ed8d50f5c improved user feedback: show matched string using 'grep --color' 2010-11-10 14:52:18 -03:00
Jonhnny Weslley fcf8a696c6 Fixes multiple matches selection 2010-11-10 12:22:49 -03:00
Jonhnny Weslley deadcd64a5 git-ignore template support. Templates are based in https://github.com/github/gitignore 2010-11-09 12:03:31 -03:00
Jonhnny Weslley fac85e1a76 git-ignore doesnt fail if .gitignore file dont exists yet 2010-11-09 10:10:01 -03:00
Tj Holowaychuk 26c4da6085 Release 0.0.7 2010-10-31 18:52:27 -07:00
Tj Holowaychuk c9540edc9e Added -d -> -D. Closes #15 2010-10-25 14:03:41 -07:00
Tj Holowaychuk 3ab9284fde Release 0.0.6 2010-10-22 16:33:14 -07:00
Devin Withers 3f06078531 Use a shallow clone in git-update-extras. 2010-10-22 16:31:14 -07:00
Devin Withers cfc94def59 Create History.md if git-changelog can't find a target. Fixes #14. 2010-10-22 16:29:29 -07:00
Alex McHale 86156ae011 Add command git-touch. 2010-10-15 09:26:45 -07:00
Tj Holowaychuk 75af76d2ac Bump version 2010-10-08 08:34:31 -07:00
Jonhnny Weslley b2713b5e56 automatically remove trailing slash from argument if it exists 2010-10-08 08:29:27 -07:00
Jonhnny Weslley 68cf02be47 added git-delete-submodule for delete submodules easily 2010-10-08 08:29:27 -07:00
Jonhnny Weslley 81ede0a4ba show ignored files if no arguments are provided 2010-10-08 08:29:27 -07:00
Tj Holowaychuk 1b5d9890f9 git-setup argument is now optional, defaulting to the CWD 2010-09-14 14:52:41 -07:00
Tj Holowaychuk 938bf5420f Styling 2010-09-13 16:12:59 -07:00
Tj Holowaychuk 573440a2b3 Alias repl "ls" as ls-files 2010-09-13 16:12:28 -07:00
Tj Holowaychuk 4d7a4d9ce7 Bumped version. be sure to git update-extras ! 2010-09-10 08:29:10 -07:00
Gert Van Gool ce43c42087 Don't fail if the local branch doesn't exist 2010-09-10 08:19:27 -07:00
Gert Van Gool a3cbb7df9a Also delete the remote branch 2010-09-10 08:19:27 -07:00
Jonathan "Duke" Leto 843fc7ad11 Fix commit and file count in git-summary with a commitish 2010-09-08 15:16:49 -07:00
Jonathan "Duke" Leto 3662dd95bf Make git-summary take an optional commitish 
This allows you to ask for a git summary based on a commitish, which is
very useful if you have a lot of project history. For example, if you
want a summary since the tag v42

$ git summary v42..
 2010-09-08 15:16:49 -07:00
Tj Holowaychuk aefe5c0f1c Fix shift in git-count 2010-09-07 08:55:36 -07:00
Tj Holowaychuk 8d4f55b048 git-graft dest branch defaults to master 2010-09-06 13:27:29 -07:00
Aggelos Orfanakos 488a15de7a Use test -d for a more compatible directory check 2010-09-02 20:06:08 +03:00
Aggelos Orfanakos 9a1fcf98e9 Add git-setup 2010-09-02 08:31:57 +03:00
Tj Holowaychuk 4b6d4ff743 Misc refactoring 2010-08-28 12:20:12 -07:00
Kenneth Reitz 85c95d1002 Graft Update 2010-08-28 12:19:33 -07:00
Kenneth Reitz d978428973 Added git-graft. 2010-08-28 12:16:54 -07:00
Kenneth Reitz 22ac367284 Added git-undo for removing recent commits. 2010-08-27 23:22:26 -07:00
Kenneth Reitz db43e1f6aa Added the essential'fresh-branch' feature. Updated Readme.md accordingly. 2010-08-27 21:20:33 -07:00
Tj Holowaychuk 7318faccd9 Release 0.0.3 2010-08-27 13:46:20 -07:00
Tj Holowaychuk 2675fbf411 Added git-extras-version 2010-08-27 13:44:41 -07:00
Tj Holowaychuk d91aab34e5 Added git-update-extras 2010-08-27 13:42:36 -07:00
Tj Holowaychuk b60ca7c604 Fixed git-contrib issue when the username is in a commit msg 
For example "visionmedia" might be in a submodule commit,
so grep fucks up and does not show the contrib properly. The down side
of this is that you need to specify the entire user name
 2010-08-27 13:36:34 -07:00
Tj Holowaychuk e2aeb48871 Delete remote tag only if local was deleted 2010-08-27 10:41:50 -07:00
Aggelos Orfanakos 183efac185 Delete remote branch only if local was deleted 2010-08-27 10:41:28 -07:00