Граф коммитов

140 Коммитов

Автор SHA1 Сообщение Дата
Brendan Forster c57e9f72ae Merge tag 'Git-1.9.5-preview20141217' into update-to-1.9.5
Git for Windows 1.9.5-preview20141217
2014-12-19 10:34:53 +10:30
yuvale 571a4e1be4 Enable ambiguous completion on first Tab press
The show-all-if-ambiguous setting is now enabled in /etc/inputrc.

Previously the setting was set to off, accompanied by the comment 'Show
all instead of beeping first'. The documentation for this setting says:

  This alters the default behavior of the completion functions. If set
  to ‘on’, words which have more than one possible completion cause the
  matches to be listed immediately instead of ringing the bell. The
  default value is ‘off’.

Since the setting is off by default and setting it to off does the
opposite of what the comment says, it looks like the intent was to
enable the setting and that it's disabled by mistake. The commit
message in ed01c26 ('Kills the annoying bell') where this setting was
originally added also suggests that the setting was intended to be
enabled.
2014-11-04 11:02:58 +02:00
Phil Haack fd6b3c6c92 Remove merge=union for csproj and related files
We made this decision a long time ago in https://github.com/github/msysgit/pull/24 but we only changed the default `.gitattributes` and not the one we use when we actually create a repository with GHfW (`.gitattributes.suggested`)
2014-10-23 11:51:43 -07:00
Brendan Forster 439b0e336d removed "origin" fetch refspecs
Reasons
- people don't like seeing an "origin" remote immediately after
initializing a repository
- people don't like fetching PRs from the command line
2014-09-08 22:33:45 +02:00
Mads Kristensen c5e663d25a Adding *.publishproj to ignore
This file is generated by Visual Studio 2013 publishing and should be ignored.
2014-08-05 08:08:18 -07:00
Henrique Pereira ac5215681b Ignoring *.pyd
Ignoring Python autogenerated .pyd files
2014-04-29 15:49:56 -03:00
Drew Miller a7d2c364b4 Merge pull request #27 from github/gitconfig-tweaks
Add some features to the default gitconfig
2014-04-22 12:30:02 -07:00
Paul Betts 3b2d5a078d Add both VS2012 and VS2013 as diff tools, ditch rerere 2014-04-17 12:44:01 -07:00
Paul Betts 9bccadc086 Pimp my .gitconfig 2014-04-14 01:06:53 -07:00
Paul Betts d85e36d62f Enable FS stat cache on Windows
This commit enables the stat cache merged recently into msysgit, described at:

https://groups.google.com/forum/#!topic/msysgit/fL_jykUmUNE
2014-04-14 00:50:37 -07:00
half-ogre 2753bca976 Merge tag 'Git-1.9.0-preview20140217' into devel
Git for Windows 1.9.0-preview20140217
2014-02-25 16:16:00 -08:00
Paul Betts aa909cb86c Add cs differ back in 2014-02-10 17:52:30 -08:00
Paul Betts fa7a2a8b7a Nuke union merge 2014-02-10 17:09:53 -08:00
Bernd b17b225027 Delete oboslete etc/ssh_known_hosts2
As discussed in Issue#133 this file points to an old repo and is unused in the distribution.

Signed-Off-By: Bernd Eckenfels <bernd@eckenfels.net>
2013-12-30 21:02:16 +01:00
Brendan Forster e2bb3833b3 corrected fetchspec order so that pr references are not created/deleted unnecessarily 2013-11-05 15:00:41 +11:00
half-ogre 0f65d050d0 remove extra colon 2013-10-31 22:20:28 -07:00
Drew Miller a12a3721d8 Merge tag 'Git-1.8.4-preview20130916' into devel
Git for Windows 1.8.4-preview20130916
2013-10-31 09:43:06 -07:00
Haacked 131f91b16a Address security vulnerability with PATH
See https://github.com/github/Windows/issues/1771 for details.
2013-10-31 09:28:56 -07:00
Anselm Kruis 40564c458d Avoid beeping when setting the console title if non-ascii chars in $PWD.
Fix for issue #128 where the prompt causes the console to beep if there are
non-ASCII characters in the path. This patch replaces all non-ASCII characters
with a question mark when expanding the prompt

Signed-off-by: Anselm Kruis <a.kruis@science-computing.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-09-13 14:50:26 +01:00
Drew Miller b0d23dd1ef Merge tag 'tags/Git-1.8.3-preview20130601' into devel
Git for Windows 1.8.3-preview20130601
2013-06-17 10:23:09 -07:00
Karsten Blees cdd94cf968 Update bash/readline settings for Unicode line editing
Enable multibyte character on input and output and disable ASCII conversion
in etc/inputrc.

Signed-off-by: Karsten Blees <blees@dcon.de>
2013-06-07 17:05:04 +02:00
Pat Thoyts 848a30fb1b Merge remote-tracking branch 'rctay/ps1-title' 2013-06-02 11:19:22 +01:00
Paul Betts 81d45efb72 RIP upstream refspec
This causes Git to think there's an "upstream" remote even when there isn't
2013-05-28 14:14:34 -06:00
Bernd a1764aa35c bash_profile: use auto colors to avoid ESC in redirections
Piping the result of the `ls` command (alias) to a file will contain escape characters because the `--color` setting for `ls` is defaulting to `--color=always` instead of `--color=auto` (auto means, it will only produce color control codes on a real tty)
2013-05-23 21:11:34 +02:00
Drew Miller ca477551ee Revert "remove fetch refspecs from system config, for now"
This reverts commit 700b03ed05.
2013-04-29 12:22:02 -07:00
Drew Miller 700b03ed05 remove fetch refspecs from system config, for now
We've been setting the fetch refspec in the repo config, so having the
fetch refspecs in the system config causes trouble. We might put this
back after we decide to unset the repo's config, but for now we'll fetch
PRs explicitly when cloning to a branch.
2013-04-18 11:20:05 -07:00
Drew Miller c2dded4fdf Merge tag 'tags/Git-1.8.1.2-preview20130201' into devel
Git for Windows 1.8.1.2-preview20130201
2013-04-16 16:22:42 -07:00
Tay Ray Chuan c40377c36c Merge commit '0433db08af3db8454dd90cb416060dae2fe64716' into ps1-title
In effect, this reverts 0433db08af, since
its motivation (beep, double-display of pwd) is no longer present.

Conflicts:
	etc/profile
2013-04-09 14:42:49 +08:00
Tay Ray Chuan dac8d21204 Merge commit '759a59f67bfcb7cf1fb11f289d04398eb78de908' into ps1-title
In effect, this reverts the change of the escape sequence from

  \033]0;

to

  \033[0m

due to an incorrect understanding of their purposes in 4e4e3f3.

Conflicts:
	etc/profile
2013-04-09 14:41:42 +08:00
Tay Ray Chuan 06a3e9c00a PS1: fix annotations
In 4e4e3f3, the 0; and bell etc. were incorrectly interpreted as having
to do with colors. In fact, it is responsible for setting the window
title. [1]

[1] http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
2013-04-09 13:59:21 +08:00
Paul Betts 480d19d730 I am the worst at everything in the world 2013-04-05 11:24:34 -07:00
Paul Betts df892eaa67 Fetch PRs as part of git fetch 2013-04-05 11:18:53 -07:00
Phil Haack 06670bb4f2 Update gitignore with latest from VS
I also updated the python entries. They seemed to be catching too much and I assume those were meant to be directories.
2013-02-12 09:38:57 -08:00
Pat Thoyts c6bc6e117d Revert "Enable the wincred credential helper by default for Windows users."
This reverts commit 2db3aa7c41.

An end user cannot unset configuration options which means that it is not
possible to disable this feature without administrative permissions. This
should only be set in the global or repository configuration files unless
the user chooses to enable this option upon installation.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-02-01 09:13:43 +00:00
Pat Thoyts 2db3aa7c41 Enable the wincred credential helper by default for Windows users.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-01-10 13:35:51 +00:00
Pat Thoyts 0433db08af shell prompt should not beep and only show MSYSTEM when non-standard.
The last change also printed the current working directory twice - once
after the MSYSTEM and once after user@host. Reduced to a single instance.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-12-04 22:55:17 +00:00
Johannes Schindelin 947ccf6973 Merge branch 'devel' of https://github.com/salsifis/msysgit
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Conflicts:
	etc/profile
2012-12-03 16:23:51 -06:00
half-ogre 93e8418133 Merge tag 'tags/Git-1.8.0-preview20121022' into devel 2012-11-19 10:23:55 -08:00
Sebastian Schuberth b4546cc621 Make grep in Cygwin path-stripping code case-sensitive for consistency
The previous "case" check already is case-sensitive, so there is no point
in making grep case-insensitive.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-10-29 22:29:49 +01:00
Sebastian Schuberth 2ca4d55612 Improve Cygwin path-stripping code (fixes issue #67)
Using awk to strip any Cygwin path creates a null-byte at the end of the
string. This makes the last item in the path unresolvable and causes child
processes that are not dependent on msys-1.0.dll to inherit POSIX rather
than Windows paths. Fix this by not using awk at all.

Reported-by: John Stevenson <john-stevenson@blueyonder.co.uk>
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-10-28 15:00:19 +01:00
Sebastian Schuberth 3e7fb81e72 Revert "Improve Cygwin path-stripping code"
This reverts commit eb648717f2 as it
replaces spaces in paths in PATH with colons.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-10-27 22:37:23 +02:00
John Stevenson eb648717f2 Improve Cygwin path-stripping code
Using awk to strip the Cygwin paths creates a null-byte at the end of the string. This makes the last item in the path unresolvable and causes child processes that are not dependent on msys-1.0.dll to inherit POSIX rather than Windows paths. This routine avoids awk and includes code from nicerobot on StackOverflow: http://stackoverflow.com/a/370255/1127485

Signed-off-by: johnstevenson <john-stevenson@blueyonder.co.uk>
2012-10-27 20:21:06 +01:00
Pat Thoyts 206019cae3 Source git-prompt.sh if present.
In git commit af31a456 the git prompt code was moved out into another
file to permit lazy loading of bash functions. To maintain our git
prompt we must source both files now.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-09-28 11:26:35 +01:00
Benoit Mortgat 759a59f67b Bash PS1: Correctly enclose nonprintable sections
`\[` and `\]` are used for enclosing nonprinting characters in bash PS1.
Enclosing printable characters inside those bracket pairs results in bad
behaviour when the PWD contains characters from an extended character
set (not strictly in ASCII).

Therefore, instead of enclosing big chunks of PS1 inside `\[`...`\]`
pairs, we only put them around the small, non-printable character parts.

Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:51 +02:00
Benoit Mortgat 4e4e3f3fef Bash PS1: Split up PS1 into small components
Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:48 +02:00
Benoit Mortgat 707197edb5 Bash PS1: refactor code for better readability
Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:44 +02:00
Adam Roben 74af242d00 Merge tag 'Git-1.7.11-preview20120620' into devel
Git for Windows 1.7.11-preview20120620
2012-06-25 13:47:18 -04:00
Pat Thoyts aaf4a7cc0c Revert "Add an up-to-date test for msys-1.0.dll"
This reverts commit f08322cab3

This check no longer works as since 60527eb binaries may be modified on
installation to speed up loading which changes the MD5 checksum on the
users system.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-20 20:38:16 +01:00
Tim Clem 70baf56a05 Merge remote-tracking branch 'origin/better-gitignore' into devel 2012-06-11 17:36:19 -07:00
Adam Roben efcb0fe814 Remove a bunch of extraneous ** from patterns in etc/gitignore
These were added in ef3e533f2e, but they
are hurting, not helping. Consider the following patterns:

foo/
**/foo/
foo/**

The first will match all directories named "foo" (and anything inside
them) no matter where they reside in the repository.

The second will match directories named "foo" (and anything inside
them), but only if they are below the .gitignore in the directory
structure.

The third will match anything inside all directories named "foo".

Because Git only tracks files, not directories, the first and third
patterns are essentially equivalent. Since the first is simpler, we
should prefer it.

The second pattern can be useful in some cases, but as far as I can tell
it is not actually desired in any of the cases where we are currently
using it.

So, I've replaced all instances of patterns 2 and 3 above with pattern
1.
2012-06-11 10:09:44 -04:00