Commit graph

944 commits

Author SHA1 Message Date
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 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
Takuma Yamaguchi 12e416a324 add git-sync 2016-01-14 00:19:12 +09:00
Nimit Kalra e7083decec Merge pull request #499 from tj/add-bsd-installation
Add BSD installation instructions.
2016-01-09 18:03:36 -06:00
Nimit Kalra e6398ba24f Add BSD installation instructions.
Fixes #498.
2016-01-09 18:03:19 -06:00
Jan Schulz 64f9e4d797 installation.md: Update information about column.exe
column.exe will be available in the next git release:
https://github.com/git-for-windows/build-extra/pull/92

Also convert tabs to spaces... Was mixed up to now :-/
2016-01-06 15:54:04 +01:00
Jan Schulz 6bf64fbb23 install.cmd: add a check for write rights to the install folder
This was happening earlier as well, but the error messages were the
raw messages from the failed writes...
2016-01-06 15:54:03 +01:00
Jan Schulz a20d4bc890 install.cmd: properly escape the ! in the shebang line
This was a regression introduced by the useage of `enabledelayedexpansion`,
which results in `!` treated as variable identifier like `%`. The result
was that git didn't treat the scripts as git commands...
2016-01-06 15:53:49 +01:00
hemanth.hm 2ef6df6182 Merge pull request #496 from JanSchulz/win_inst
Make the win installer more robust
2016-01-06 12:43:58 +05:30
Jan Schulz 672c87e9e4 Make the win installer more robust
User visible:
* Also accept the git install path (and not the mingw64 subdir) as a user
  supplied install location. Make it the new default and warn the user if
  a mingw64 dir is supplied (=this dir is not checked, so it might be
  anywhere...)
* Find git.exe in path and use that as an install location
* Add error|status messages and output less noise (robocopy)
* do some check if column.exe is not found...
* adjust the installation text for windows...

not user visible:
* more.exe does not work when used in a cmd which has a unicode codepage
  -> save the current codepage and set a sane default during the install
* do some "magic" with quotes around path variables -> makes it work with
  pathes with spaces in it (both final git dir and the git-extra checkout)
* Do not leak variables to the sourounding interpreter
2016-01-05 15:57:09 +01:00
hemanth.hm ef73afb39e Merge pull request #494 from apjanke/fix-git-repo-inclusion
Makefile: fix inverted list of commands that use is_git_repo
2016-01-05 16:27:11 +05:30
hemanth.hm cf0fa9da2d Merge pull request #495 from JanSchulz/patch-1
Update Installation.md
2016-01-05 15:58:38 +05:30
Jan Schulz 7ec7a18671 Update Installation.md
Update windows install instructions.
2016-01-05 11:24:41 +01:00
Andrew Janke a1530d90f2 Makefile: fix inverted list of commands that use is_git_repo 2015-12-31 20:28:13 -05:00
Nimit Kalra 90ba942cf6 Add Gitter badge. 2015-12-29 12:31:11 -06:00
Nimit Kalra 39ed77253c Bump version to 4.1.0-dev. 2015-12-29 00:03:19 -06:00
Nimit Kalra 94556f380b Version 4.0.0 2015-12-28 22:42:20 -06:00
Nimit Kalra bb02bdcd55 Add David Rogers to AUTHORS. 2015-12-28 22:32:11 -06:00
Nimit Kalra 1ff64e2fed Merge pull request #481 from al-the-x/multi-file-touch
Make `git-touch` behave like `touch` when passed multiple files.
2015-12-28 22:17:01 -06:00
David Rogers 2b042bdd59 Better USAGE message 2015-12-28 14:07:09 -05:00
David Rogers 64639e1437 Touch multiple files supplied 2015-12-28 14:06:30 -05:00
David Rogers 3c874ce9f4 Use $@ instead of $* re #467
Blind first pass so that I have a PR to remind me...
2015-12-28 13:53:49 -05:00
Nimit Kalra 176ebf9da1 Update AUTHORS. 2015-12-28 01:32:21 -06:00
Nimit Kalra 168f59e772 Merge pull request #490 from apjanke/etc-under-prefix
installation: put $SYSCONFDIR (etc) under $PREFIX by default
2015-12-28 00:01:31 -06:00
Andrew Janke cbad7c63eb installation: put $SYSCONFDIR (/etc) under $PREFIX by default 2015-12-28 00:45:04 -05:00
Nimit Kalra d46c515d6d Merge pull request #489 from apjanke/customize-etcdir
Makefile: allow customizing of SYSCONFDIR (/etc) location.
2015-12-27 17:11:02 -06:00
Andrew Janke 4354cca461 Makefile: allow customizing of SYSCONFDIR (/etc) location 2015-12-27 17:14:17 -05:00
Nimit Kalra 4c06b7f074 Merge pull request #488 from apjanke/git-clear-shebang
Fix missing shebang in git-clear and missing +x on others.
2015-12-27 14:10:56 -06:00
Andrew Janke a09eefde25 Fix missing shebang in git-clear and missing +x on others 2015-12-27 15:02:55 -05:00
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