Commit graph

809 commits

Author SHA1 Message Date
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 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
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
hemanth.hm dc498c0614 Merge pull request #424 from nicolaiskogheim/fork-docs
fork docs: change SSH to HTTPS in example
2015-08-08 20:45:39 +05:30
hemanth.hm 2912d3522c Merge pull request #422 from nicolaiskogheim/effort-bugfix
effort: fix active days always 1
2015-08-08 20:43:27 +05:30
Nicolai Skogheim b1fba8f3fe effort docs: add note about omitting unsorted results 2015-08-08 09:06:54 +02:00
Nicolai Skogheim d51f4fde37 effort docs: add example with directories 2015-08-08 09:06:54 +02:00
Nicolai Skogheim d367affd57 effort docs: filename -> path 2015-08-08 09:06:54 +02:00
Nicolai Skogheim 96329378b9 effort docs: Adjust numbers in example
The values shown can never appear, and makes no sense.
2015-08-08 09:06:54 +02:00
Nicolai Skogheim 4527656f7c effort: rename 'file' to 'path' to be more accurate 2015-08-08 09:06:54 +02:00
Nicolai Skogheim 09e039ceae fork docs: change SSH to HTTPS in example 2015-08-08 05:06:31 +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
hemanth.hm 5c27f6b2d1 Merge pull request #420 from nicolaiskogheim/git-summary
summary and line-summary. docs and style
2015-08-07 16:42:40 +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 7fbe00c311 summary docs: Remove --line example
Since using --line only makes git-summary call git-line-summary
the example is redundant. It is also somewhat smelly to document
other functions than it's own like that.
2015-08-07 08:36:55 +02:00
Nicolai Skogheim ca4cb46dde summary docs: explain relation to git-line-summary 2015-08-07 08:36:55 +02:00
Nicolai Skogheim cdc4d8a0cf summary docs: use correct order of arguments
If you were to follow the docs on git-summary(1),
it would crash.
2015-08-07 08:36:55 +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 aeebb1c1c1 guilt: document call without arguments 2015-08-07 08:35:32 +02:00
Nicolai Skogheim a212a78c1b guilt docs: Capitalize letters 2015-08-07 08:35:32 +02:00
Nicolai Skogheim ea0af0c391 guilt: Adds simplified example 2015-08-07 08:35:32 +02:00
hemanth.hm 8a559a070a Merge pull request #418 from nicolaiskogheim/fork-bugfix
fork: http-urls had colon instead of slash
2015-08-05 11:58:26 +05:30
Nicolai Skogheim 8f1729d5f7 fork: http-urls had colon instead of slash 2015-08-05 04:27:32 +02:00
hemanth.hm db95415385 Merge pull request #416 from nicolaiskogheim/fork-docs
fork: original->upstream in docs
2015-08-05 03:12:02 +05:30
hemanth.hm f943a2db50 Merge pull request #415 from nicolaiskogheim/contrib-docs
contrib: update docs
2015-08-05 03:11:37 +05:30
Nicolai Skogheim 04b63cbc10 fork: original->upstream in docs 2015-08-04 19:53:49 +02:00
Nicolai Skogheim 7b287a8ea7 contrib: update docs 2015-08-04 19:19:46 +02:00
hemanth.hm ddfd3d9752 Merge pull request #414 from nicolaiskogheim/alias-docs
alias: docs
2015-08-04 06:17:23 +05:30
Nicolai Skogheim c4ffb30410 alias: docs
Fixes a formatting issue (markdown).
Ran manning-up.sh, which brought in changes
from an earlier commit also
2015-08-04 02:32:58 +02:00
Rémy HUBSCHER 3039f9405e Add completion for git-psykorebase. 2015-07-31 17:06:22 +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 9629fdf13c alias: polish the docs 2015-07-29 13:19:18 +02:00
Nicolai Skogheim 24ad1c8281 alias: bugfix
'git alias <search-term>' did not work.
2015-07-29 13:15:34 +02:00
hemanth.hm 3a8c947922 Merge pull request #408 from nicolaiskogheim/refactor-contrib
contrib: refactor, and conform to git
2015-07-29 16:06:42 +05:30
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
hemanth.hm f0194060c5 Merge pull request #406 from nicolaiskogheim/portable-msysgit
Portable msysgit
2015-07-29 13:35:09 +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