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
852 commits 5 branches 57 tags 6.1 MiB
Commit graph

852 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
hemanth.hm dae750f734 Merge pull request #432 from stevemao/patch-1 
fix link of `git feature|refactor|bug|chore`
 2015-08-26 12:08:21 +05:30
Steve Mao 7b06400ac7 fix link of git feature|refactor|bug|chore 2015-08-25 16:00:39 +10:00
hemanth.hm 6808b0fd79 Merge pull request #425 from nicolaiskogheim/makefile-fix 
Set default make task to be install
 2015-08-20 16:28:43 +05:30
Nicolai Skogheim 7e147993d4 Mark default task as .PHONY 2015-08-20 12:47:50 +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 3b02c65a94 Merge pull request #428 from spacewander/update-commands 
update Commands.md
 2015-08-14 17:12:20 +05:30
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
luozexuan 11fd45791b update Commands.md 2015-08-14 14:49:32 +08: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 fa4c5dd456 Improve man page presentation. 2015-08-11 11:30:36 +02:00
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 9859396131 change 'search-term' to 'search-pattern' 2015-08-09 19:33:13 +08:00
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