Commit graph

981 commits

Author SHA1 Message Date
spacewander 299efd84af submit zsh completion script to upstream
Now what you need is just `source /path/to/git-extras-completion.zsh`
2016-07-21 23:48:06 +08:00
spacewander 61c197bdbd update the title of git-clear-soft 2016-07-21 22:57:34 +08:00
hemanth.hm 217f536606 Merge pull request #550 from phuu/patch-1
Add note about overwriting git aliases
2016-07-19 21:55:11 +05:30
Tom Ashworth e2305d4501 Add note about overwriting git aliases 2016-07-19 16:43:27 +01:00
hemanth.hm f50447e6bd Merge pull request #547 from svanburen/patch-1
Fix typo
2016-07-12 23:22:38 +05:30
Stefan VanBuren fece2a517a Fix typo 2016-07-12 13:23:03 -04:00
hemanth.hm eb046dcdb3 Merge pull request #545 from spacewander/via_ssh
fix git-fork by removing '.git'
2016-06-27 18:51:29 +05:30
spacewander 09bbb56a39 fix git-fork by removing '.git' 2016-06-27 19:43:07 +08:00
hemanth.hm 381a0ff1fb Merge pull request #543 from spacewander/via_ssh
fix the support for forking via ssh
2016-06-27 12:28:28 +05:30
spacewander 34f5245672 fix the support for forking via ssh 2016-06-27 14:00:37 +08:00
hemanth.hm 1f374d1ea9 Merge pull request #412 from spacewander/git-obliterate
update git obliterate
2016-06-02 05:56:08 +05:30
hemanth.hm 1aadd1c52f Merge pull request #536 from spacewander/delete_submodule
Update the way to delete submodule
2016-06-01 20:06:49 +05:30
hemanth.hm becb14ad01 Merge pull request #537 from vigilancer/master
update documentation. fix "git ignore-io" flags
2016-05-25 14:22:02 +05:30
Andrey Elizarov 3c16905754 update documentation. fix "git ignore-io" flags 2016-05-25 07:01:10 +04:00
spacewander a39c89e34e Update the way to delete submodule 2016-05-17 17:20:03 +08:00
hemanth.hm b485aabea0 Merge pull request #533 from Addvilz/add-git-clear-soft-modify-git-clear
Add git clear-soft, modify git clear to indicate explicit removal of files
2016-05-02 19:38:30 +05:30
Matiss 3783a27a39 Edit description of git clear-soft to indicate hard reset 2016-05-01 19:10:54 +02:00
Matiss 61fee79cc7 Add git-clear-soft command
Modify git-clear to indicate default behavior of removing git ignored files
2016-05-01 19:05:21 +02:00
hemanth.hm e7826a717c Merge pull request #513 from lgastako/master
Add -m flag to git-setup to set the initial commit message.
2016-04-20 21:45:36 +05:30
hemanth.hm b865a2bae5 Merge pull request #525 from spacewander/git-standup
add git standup
2016-04-19 12:49:45 +05:30
hemanth.hm 24439aac6d Merge pull request #526 from carrodher/patch-1
Add Ubuntu installation
2016-04-19 12:49:17 +05:30
Carlos Rodríguez b8418cfba5 Add Ubuntu installation 2016-04-18 18:31:13 +02:00
spacewander 98f85c90b0 add docs for git standup 2016-04-15 20:34:03 +08:00
spacewander c43d4f2539 add git-standup 2016-04-14 15:40:11 +08:00
Nimit Kalra e91343e376 Merge pull request #519 from ifdattic/patch-1
Fix typo: typess => types
2016-03-19 13:25:26 -05:00
Andrew Marcinkevičius 301b436220 Fix typo: typess => types 2016-03-19 19:53:06 +02:00
hemanth.hm ddb097d65d Merge pull request #515 from ammarnajjar/fedora-install
Add Fedora package-manager installation instruction
2016-03-07 18:25:03 +05:30
Ammar Najjar 9090d3bbe9 Add Fedora package-manager installation instruction 2016-03-06 13:30:08 +01:00
John Evans 555282985d Add -m flag to git-setup to set the initial commit message. 2016-03-03 01:12:19 -05:00
hemanth.hm 71cf48b0c1 Merge pull request #512 from Lee-W/master
Fix ignore-io searching bug
2016-02-16 09:50:39 +05:30
Lee Wei 56a2e27910 Merge pull request #1 from tj/master
Update with the upstream
2016-02-16 11:30:22 +08:00
LeeW 3603b67eb7 Fix ignore-io searching bug 2016-02-16 11:17:04 +08:00
hemanth.hm ac0b5fe5ed Merge pull request #508 from pra85/patch-1
Mention initial copyright year and add contributors to copyright
2016-01-30 18:05:26 +05:30
Prayag Verma d286839da1 Mention initial copyright year and add contributors to copyright
I am not a lawyer but according to http://www.copyright.gov/circs/circ01.pdf (See screenshot of relevant section below), mentioning the first year of publication in the copyright is a good thing

![selection_008](https://cloud.githubusercontent.com/assets/829526/12409934/7021c3a6-be95-11e5-8d1a-18f6948571e0.png)

Mentioning 2010 as the first release happened at that time - https://github.com/tj/git-extras/releases/tag/0.0.1

Also adding `Contributors` to copyright because TJ Holowaychuk is not the only person owning copyright for the whole project. The copyright is collectively owned by all contributors, or more precisely: every contributor owns a copyright on the code he or she has contributed.

The only way to retain full copyright over code is to ask for signing contributor's agreement before merging in changes. This is, in fact, what some companies who license commercially their free software do.
2016-01-30 17:30:04 +05:30
Nimit Kalra edbcb3f4c0 Merge pull request #509 from supercrabtree/master
Fix Typo in `git-clear` Documentation.
2016-01-30 00:25:59 -06:00
George Crabtree 511c135e2f Fix typo in git-clear documentation 2016-01-28 22:18:36 +11:00
Nimit Kalra 8a8a483f41 Bump version to 4.2.0-dev. 2016-01-24 15:07:09 -06:00
Nimit Kalra 0ca4c6f221 Version 4.1.0 2016-01-24 15:04:10 -06:00
hemanth.hm 5b45eb702b Merge pull request #503 from spacewander/fix_502
Fixes #502
2016-01-24 19:48:38 +05:30
hemanth.hm a4a001dde9 Merge pull request #507 from rstacruz/git-pr-manual
Regerenate git-pr.html
2016-01-23 18:10:41 +05:30
Rico Sta. Cruz 9d2df44d18 Regerenate git-pr.html 2016-01-22 20:51:36 +08:00
hemanth.hm e6cdd2cf56 Merge pull request #506 from rstacruz/git-pr-manual
Update git PR manual to mention URLs
2016-01-22 15:39:24 +05:30
Rico Sta. Cruz 0fde295f5e Update git PR manual to mention URLs 2016-01-22 18:01:28 +08:00
spacewander a192fe688a handle GIT_EDITOR which contains space 2016-01-20 18:48:19 +08:00
spacewander afce25cd65 use ps -f and awk to emulate pgrep
There is no pgrep in git for windows
2016-01-20 11:39:25 +08:00
Nimit Kalra 98d0d8c642 Merge pull request #500 from kumon/master
Add "sync" command.
2016-01-16 23:41:03 -06:00
Takuma Yamaguchi f0ecd82129 add upstream check & bugfix 2016-01-17 00:56:45 +09:00
Takuma Yamaguchi 19ece6192e add example of git-sync 2016-01-16 01:47:30 +09:00
Takuma Yamaguchi 3481ff245e upstream is used by default 2016-01-16 01:40:10 +09:00
Nimit Kalra 642eedeab5 Merge pull request #497 from JanSchulz/win_inst2
Update windows install.cmd
2016-01-14 12:49:25 -06:00