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

902 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nimit Kalra 91ca995edc Update all man pages. 2015-12-27 11:26:38 -06: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 106acae943 Regenerate git-changelog man pages (.html and .1) for #471. 2015-10-18 13:44:45 -05: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
hemanth.hm 889a65883f Merge pull request #469 from JanSchulz/windows-install 
Use the default installation path in install.cmd
 2015-10-18 18:36:42 +05:30
hemanth.hm 7dce2bbbdf Merge pull request #468 from spacewander/use-real-purplish 
use real purplish
 2015-10-18 18:36:22 +05:30
Jan Schulz 546ddf78af Use the default installation path in install.cmd 2015-10-17 12:25:14 +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
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
LeeW 81e8a45b38 Update git-ignore-io mannual 2015-09-20 18:44:40 +08:00
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
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
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