Commit graph

868 commits

Author SHA1 Message Date
hemanth.hm 7dce2bbbdf Merge pull request #468 from spacewander/use-real-purplish
use real purplish
2015-10-18 18:36:22 +05:30
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
hemanth.hm dfe0c79f45 Merge pull request #465 from spacewander/fix-color
Fix color
2015-10-10 09:42:55 +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
hemanth.hm d82c9b4576 Merge pull request #458 from apjanke/makefile-refactor-libs
Makefile: refactor is-git-repo inclusion logic
2015-10-02 22:05:09 +05:30
hemanth.hm 166f9599e7 Merge pull request #459 from apjanke/effort-portable-colors
git-effort: use portable terminal escape sequences
2015-10-02 22:03:54 +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
Andrew Janke ed7dcb7682 Makefile: refactor is-git-repo inclusion logic
This avoids the need for a big repeated block of code.
2015-10-02 05:47:08 -04:00
hemanth.hm faaae9fa6b Merge pull request #454 from apjanke/makefile-escape-mktemp
Makefile: escape $ used inside eval as shell variable
2015-10-02 13:35:35 +05:30
Andrew Janke 5b285380e7 Makefile: escape $ used inside eval as shell variable 2015-10-02 03:48:53 -04:00
hemanth.hm cc488a035d Merge pull request #453 from jhnns/pr-url
Add possibility to also checkout pull requests based on GitHub urls
2015-09-26 13:16:36 +05:30
Johannes Ewald 7b74567550 Add possibility to also checkout pull requests based on GitHub urls 2015-09-24 16:11:06 +02:00
hemanth.hm bb1623ba5d Merge pull request #452 from akimd/summary-locale
summary: beware of locale issues, and pass options to line-summary
2015-09-23 23:00:42 +05:30
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
hemanth.hm 91aff4fe20 Merge pull request #444 from spacewander/install_without_alias
add alias conflict prompt
2015-09-22 11:44:22 +05:30
hemanth.hm f8b81131a5 Merge pull request #446 from ssssam/fix-active-days
effort, summary: Correctly estimate the number of active days
2015-09-22 11:44:11 +05:30
hemanth.hm 60098c9629 Merge pull request #447 from RichardLitt/patch-1
Alphabetized list
2015-09-22 11:43:56 +05:30
Richard Littauer c0ad975f22 Alphabetized list 2015-09-14 11:01:35 -04: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
spacewander 9916356b14 add alias conflict prompt 2015-09-13 09:55:49 +08:00
hemanth.hm 26a8b901a0 Merge pull request #440 from spacewander/features/feature-alias
add alias to git-feature
2015-09-12 11:49:01 +05:30
Rémy HUBSCHER 639210660e Make sure git-authors doesn't return twice the same one. 2015-09-11 20:14:36 +02:00
spacewander f6f45990ab update git-feature docs 2015-09-11 20:23:20 +08:00
spacewander 38c7b03372 add alias to git-feature 2015-09-11 20:23:17 +08:00
hemanth.hm 80a7928b67 Merge pull request #441 from spacewander/features/remove-checkout
remove duplicate checkout
2015-09-08 20:16:23 +05:30
spacewander a7f830b1e7 remove duplicate checkout 2015-09-08 16:08:50 +08:00
hemanth.hm bb4acf0757 Merge pull request #436 from nwinkler/patch-1
Updated documentation for git-ignore
2015-09-05 16:44:36 +05:30
hemanth.hm 0e05f63147 Merge pull request #437 from nwinkler/patch-2
Fixed typo in install.sh
2015-09-05 16:44:14 +05:30
Nils Winkler 30747be220 Fixed typo in install.sh
s/exras/extras/
2015-09-04 13:44:51 +02:00
Nils Winkler 55bfebbc21 Updated documentation for git-ignore
* Updated output for `git ignore`
* Added description and examples for `git ignore -g` and `git ignore -l`
2015-09-04 11:09:32 +02:00
hemanth.hm e042c5ceb7 Merge pull request #435 from nwinkler/patch-1
Added details to git-pr documentation
2015-09-03 14:22:15 +05:30
Nils Winkler da76b2ae86 Added details to git-pr documentation
Details for:

* Using a remote other than `origin` by providing it in the second parameter.
* Using the `clean` parameter to remove all local `pr/*` branches.
2015-09-03 10:50:27 +02:00
hemanth.hm 1eba324e94 Merge pull request #433 from grindhold/git-clear
Git clear
2015-09-03 11:30:34 +05:30
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 ecf7f05f12 added git-clear to Commands.md 2015-08-26 22:20:09 +02:00
grindhold 2c855e991c added manpage for git-clear 2015-08-26 22:13:12 +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