Commit graph

964 commits

Author SHA1 Message Date
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
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