Merging rebase to v2.1.2 by t-b · Pull Request #10 · git-for-windows/git

Commits on Jun 24, 2014

l10n: Fix more typos in the Swedish translations
nafmo
committed

Commits on Jul 30, 2014

revision: drop useless string offset when parsing "--pretty"

peff
authored and
gitster
committed
pretty: treat "--format=" as an empty userformat

peff
authored and
gitster
committed
pretty: make empty userformats truly empty

peff
authored and
gitster
committed

Commits on Aug 3, 2014

Commits on Aug 4, 2014

Commits on Aug 5, 2014

Commits on Aug 7, 2014

Commits on Aug 23, 2014

Commits on Aug 25, 2014

pack-refs: prune top-level refs like "refs/foo"

peff
authored and
gitster
committed
fast-import: clean up pack_data pointer in end_packfile

peff
authored and
gitster
committed
fast-import: fix buffer overflow in dump_tags

peff
authored and
gitster
committed
git-prompt: do not look for refs/stash in $GIT_DIR

peff
authored and
gitster
committed
Merge git://github.com/git-l10n/git-po
gitster
committed
checkout -m: attempt merge when deletion of path was staged

jrn
authored and
gitster
committed

Commits on Aug 26, 2014

Commits on Aug 28, 2014

Document LF appearing in shallow command during send-pack/receive-pack

spearce
authored and
gitster
committed

Commits on Aug 29, 2014

Commits on Sep 3, 2014

reachable.c: add HEAD to reachability starting commits

max630
authored and
gitster
committed

Commits on Sep 10, 2014

fsck: exit with non-zero status upon error from fsck_obj()

peff
authored and
gitster
committed

Commits on Sep 11, 2014

config: avoid a funny sentinel value "a^"

peff
authored and
gitster
committed

Commits on Sep 12, 2014

fsck: return non-zero status on missing ref tips

peff
authored and
gitster
committed

Commits on Sep 16, 2014

mailinfo: make ">From" in-body header check more robust

peff
authored and
gitster
committed
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>

sorganov
authored and
gitster
committed

Commits on Sep 19, 2014

Commits on Sep 22, 2014

mailinfo: work around -Wstring-plus-int warning

sunshineco
authored and
gitster
committed

Commits on Sep 25, 2014

po/TEAMS: add new member to German translation team
ralfth
committed
l10n: de.po: change Email to E-Mail

PhillipSz
authored and
ralfth
committed
l10n: de.po: use comma before "um"

PhillipSz
authored and
ralfth
committed

Commits on Sep 28, 2014

Merge branch 'maint' of git://github.com/git-l10n/git-po into maint
gitster
committed

Commits on Sep 30, 2014

Commits on Oct 7, 2014

Commits on Oct 13, 2014

Start the merging-rebase to junio/maint
t-b
committed
Makefile: do not depend on curl-config

kusma
authored and
t-b
committed
Unicode file name support (gitk and git-gui)

kblees
authored and
t-b
committed
core.hidedotfiles: hide '.git' dir by default

kusma
authored and
t-b
committed
When initializing .git/, record the current setting of core.hideDotFiles

dscho
authored and
t-b
committed
mingw: add tests for the hidden attribute on the git directory

patthoyts
authored and
t-b
committed
git am: ignore dirty submodules

dscho
authored and
t-b
committed
criss cross rename failure workaround

j6t
authored and
t-b
committed
Add a few more values for receive.denyCurrentBranch

dscho
authored and
t-b
committed
Let deny.currentBranch=updateInstead ignore submodules

dscho
authored and
t-b
committed
Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"

hvoigt
authored and
t-b
committed
git-gui: provide question helper for retry fallback on Windows

hvoigt
authored and
t-b
committed
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

dscho
authored and
t-b
committed
Work around the command line limit on Windows

dscho
authored and
t-b
committed
Fix another invocation of git from gitk with an overly long command-line

FauxFaux
authored and
t-b
committed
gitk: Use an external icon file on Windows

sschuberth
authored and
t-b
committed
gitweb: Allow line number toggling with Javascript

dscho
authored and
t-b
committed
Gitweb: make line number toggling work for Firefox and Safari

dscho
authored and
t-b
committed
Gitweb: add support for Alex Gorbatchev's SyntaxHighlighter in Javascript

dscho
authored and
t-b
committed
Only switch on the line number toggle when highlighting is activated

dscho
authored and
t-b
committed
gitweb (SyntaxHighlighter): interpret #l<line-number>

dscho
authored and
t-b
committed
t0302: check helper can handle empty credentials

jberezanski
authored and
t-b
committed
wincred: handle empty username/password correctly

jberezanski
authored and
t-b
committed
Teach 'git pull' to handle --rebase=interactive

dscho
authored and
t-b
committed
Handle the branch.<name>.rebase value 'interactive'

dscho
authored and
t-b
committed
Teach 'git remote' that the config var branch.*.rebase can be 'interactive'

dscho
authored and
t-b
committed
submodule: Fix t7400, t7405, t7406 for msysGit

sschuberth
authored and
t-b
committed
am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)

sschuberth
authored and
t-b
committed
Windows: make sure that merge-octopus only outputs LF line endings

dscho
authored and
t-b
committed
Push the NATIVE_CRLF Makefile variable to C and added a test for native.

patthoyts
authored and
t-b
committed
MinGW: Update tests to handle a native eol of crlf

Brice Lambson
authored and
t-b
committed
work around misdetection of stdin attached to a tty

hvoigt
authored and
t-b
committed
Handle new t1501 test case properly with MinGW

dscho
authored and
t-b
committed
t3102: Windows filesystems may not use a literal asterisk in filenames.

patthoyts
authored and
t-b
committed
t9350: point out that refs are not updated correctly

SRabbelier
authored and
t-b
committed
t1050: Fix invalid call to dd(1)

dscho
authored and
t-b
committed
Work around a problem identified by BuildHive

dscho
authored and
t-b
committed
t0008: avoid absolute path on Windows as colon is used in the tests

patthoyts
authored and
t-b
committed
t800[12]: work around MSys limitation

kblees
authored and
t-b
committed
tests: turn off git-daemon tests if FIFOs are not available

kasal
authored and
t-b
committed
fast-export: do not refer to non-existing marks

dscho
authored and
t-b
committed
transport-helper: add trailing --

SRabbelier
authored and
t-b
committed
remote-helper: check helper status after import/export

SRabbelier
authored and
t-b
committed
Always auto-gc after calling a fast-import transport

dscho
authored and
t-b
committed
Handle http.* config variables pointing to files gracefully on Windows

dscho
authored and
t-b
committed
Fixed wrong path delimiter in exe finding

Evgeny Pashkin
authored and
t-b
committed
Fix launching of externals from Unicode paths

aroben
authored and
t-b
committed
Make non-.exe externals work again

aroben
authored and
t-b
committed
help: correct behavior for is_executable on Windows

hvoigt
authored and
t-b
committed
Add a README.md

dscho
authored and
t-b
committed
Config option to disable side-band-64k for transport
t-b
committed
Revert "test: fix t7001 cp to use POSIX options"

kasal
authored and
t-b
committed
Win32: make FILETIME conversion functions public

kblees
authored and
t-b
committed
Win32: dirent.c: Move opendir down

kblees
authored and
t-b
committed
Win32: Make the dirent implementation pluggable

kblees
authored and
t-b
committed
Win32: make the lstat implementation pluggable

kblees
authored and
t-b
committed
add infrastructure for read-only file system level caches

kblees
authored and
t-b
committed
Win32: add a cache below mingw's lstat and dirent implementations

kblees
authored and
t-b
committed
fscache: load directories only once

kblees
authored and
t-b
committed
Add a test demonstrating a problem with long submodule paths

vangdfang
authored and
t-b
committed
Win32: support long paths

kblees
authored and
t-b
committed
Win32: fix 'lstat("dir/")' with long paths

kblees
authored and
t-b
committed
Merge 'refs/rewritten/junio/notyet' into HEAD
t-b
committed
Merge 'unicode' into HEAD
t-b
committed
Merge 'hide-dotgit' into HEAD
t-b
committed
Merge 'am-submodules' into HEAD
t-b
committed
Merge 'criss-cross-merge' into HEAD
t-b
committed
Merge 'deny-current-branch' into HEAD
t-b
committed
Merge 'git-gui' into HEAD
t-b
committed
Merge 'gitk' into HEAD
t-b
committed
Merge 'gitweb-syntax' into HEAD
t-b
committed
Merge 'jberezanski/wincred-sso-r2' into HEAD
t-b
committed
Merge 'pull-rebase-interactive' into HEAD
t-b
committed
Merge branch 'some-CR-fixes'
t-b
committed
Merge 'win-tests-fixes' into HEAD
t-b
committed
Merge 'remote-hg-prerequisites' into HEAD
t-b
committed
Merge 'http-msys-paths' into HEAD
t-b
committed
Merge 'fix-externals' into HEAD
t-b
committed
Merge 'fix-is-exe' into HEAD
t-b
committed
Merge pull request #115 from msysgit/tip4commit
t-b
committed
Merge remote-tracking branch 't-b/sideband-bug'
t-b
committed
Merge pull request #181 from kasal/tests-no-posix
t-b
committed
Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket-1.8.5.2
t-b
committed
Merge pull request #122 from kblees/kb/long-paths-v2
t-b
committed
Merge pull request #231 from kblees/kb/msysgit-2.1.0
t-b
committed
git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows

sschuberth
authored and
t-b
committed
Merge pull request #239 from sschuberth/taskkill
t-b
committed
MinGW: Use MakeMaker to build the Perl libraries

sschuberth
authored and
t-b
committed
Makefile: Set htmldir to match the default HTML docs location under MSYS

sschuberth
authored and
t-b
committed
Merge pull request #1 from t-b/new-sdk-fixes
t-b
committed
t9300: use test_cmp_bin instead of test_cmp to compare binary files

j6t
authored and
t-b
committed
Merge pull request #2 from t-b/tb_more_use_of_test_cmp_bin
t-b
committed
t5000: Fix CRLF vs LF issue
t-b
committed
t2025: Tell tail explicitly to read from stdin
t-b
committed
t5503: Mark flaky tests as known breakages
t-b
committed
t1508: Be more clever than msys path substitution
t-b
committed
Merge pull request #3 from t-b/test-fixes-again
t-b
committed
t0027: Disable test on MINGW
t-b
committed
Enable support for perl regular expressions (LIBPCRE)
t-b
committed
Merge pull request #5 from t-b/dont_execute_test_which_errors_out
t-b
committed
t0027: Tests for core.eol=native, eol=lf, eol=crlf

tboegi
authored and
t-b
committed
Merge pull request #4 from t-b/use-libpcre
t-b
committed
Mark t0027-auto-crlf as cheap enough for MinGW

dscho
authored and
t-b
committed
Merge pull request #7 from dscho/mingw-tests
t-b
committed

Merging rebase to v2.1.2#10sschuberth merged 194 commits intogit-for-windows:mastergit-for-windows/git:masterfrom t-b:mergeing-rebase-to-v2.1.2t-b/git:mergeing-rebase-to-v2.1.2Copy head branch name to clipboard

Commits

Commits on Jun 24, 2014

Commits on Jul 30, 2014

Commits on Aug 3, 2014

Commits on Aug 4, 2014

Commits on Aug 5, 2014

Commits on Aug 7, 2014

Commits on Aug 10, 2014

Commits on Aug 12, 2014

Commits on Aug 13, 2014

Commits on Aug 18, 2014

Commits on Aug 19, 2014

Commits on Aug 20, 2014

Commits on Aug 22, 2014

Commits on Aug 23, 2014

Commits on Aug 25, 2014

Commits on Aug 26, 2014

Commits on Aug 28, 2014

Commits on Aug 29, 2014

Commits on Sep 3, 2014

Commits on Sep 10, 2014

Commits on Sep 11, 2014

Commits on Sep 12, 2014

Commits on Sep 16, 2014

Commits on Sep 19, 2014

Commits on Sep 22, 2014

Commits on Sep 25, 2014

Commits on Sep 28, 2014

Commits on Sep 30, 2014

Commits on Oct 7, 2014

Commits on Oct 13, 2014

Merging rebase to v2.1.2#10
sschuberth merged 194 commits intogit-for-windows:masterfrom
t-b:mergeing-rebase-to-v2.1.2