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

427 commits

Author SHA1 Message Date
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 38c7b03372 add alias to git-feature 2015-09-11 20:23:17 +08:00
spacewander a7f830b1e7 remove duplicate checkout 2015-09-08 16:08:50 +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
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