?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge pull request #129 from snaewe/fix-merging-rebase
2013-08-15 dschoMerge pull request #129 from snaewe/fix-merging-rebase
 commit | commitdiff | tree
2013-06-12 Johannes Schindelinmerging-rebase: be more suspicious about merging-rebase...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2013-06-12 Johannes Schindelinapply-from-gmane: fall back to three-way merges
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2013-06-12 Johannes Schindelinapply-from-gmane: accept permalinks, too
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2013-06-12 Johannes SchindelinBu-bye, rebasing-merge.sh
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-12-03 Johannes SchindelinMerge branch 'devel' of https://github.com/salsifis...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-11-30 Johannes SchindelinReplace 'devel' with 'master'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-10-28 dschoMerge pull request #63 from PKRoma/pk/usehttps
 commit | commitdiff | tree
2012-06-26 Johannes SchindelinMark scripts and binaries in /bin/ as executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-25 Johannes SchindelinUpdate the release notes (preliminary)
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-23 Johannes Schindelinmerging-rebase: allow 'branch' to be something else...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-07 Johannes Schindelindisable Windows Error Reporting: really disable it
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-07 Johannes SchindelinAdd a Tcl script to disable Windows Error Reporting
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-06 Johannes SchindelinUpdate /src/curl/release.sh to download & install 7...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-05 Johannes SchindelinMerge branch 'unicode-cert-path' of git://github.com...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-06-05 Johannes SchindelinMerge branch 'fix-nosfx' of git://github.com/aroben...
commit | commitdiff | tree
2012-05-31 Johannes SchindelinmsysGit/post-install: ignore submodules
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-12 Johannes Schindelinmerging-rebase: fix a couple of obsolete comments
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-12 Johannes SchindelinAdd a new script to perform a 'merging rebase'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-12 Johannes Schindelinrun-tests: use /usr/git/ instead of /git/ to please...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-04 Johannes Schindelinwhat-made-this-repo-so-large: hide stderr
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-03 Johannes SchindelinMark show-github-usage as executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-03 Johannes SchindelinAdd a script to find out what is responsible for repo...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-05-02 Johannes SchindelinMerge branch 'copy-files-error-checking' of https:...
commit | commitdiff | tree
2012-05-02 Johannes Schindelin upload-to-github: allow spaces in filenames
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-18 Johannes SchindelinRename github-usage.sh
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-17 Johannes Schindelinupload-to-github: also guess user from ~/.netrc
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-17 Johannes Schindelinupload-to-github: default to the msysgit/git repository
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-17 Johannes SchindelinAdd a script to enquire about our disk usage on GitHub
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-17 Johannes SchindelinAdd a script to upload stuff to GitHub
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-10 Johannes Schindelinapply-from-gmane: grok mid.gmane.org URLs and strip...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-10 dschoMerge pull request #5 from ciaranj/UpdateReleaseNotesForUnicode
 commit | commitdiff | tree
2012-04-10 Johannes Schindelinmsvc-build: make sure transient files are git-ignored
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-10 Johannes SchindelinGit for Windows 1.7.10-preview20120409
 commit | commitdiff | tree
2012-04-10 Johannes SchindelinCommit the git-cheetah submodule in preparation for...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-10 Johannes SchindelinGit for Windows 1.7.10-preview20120409
 commit | commitdiff | tree
2012-04-10 Johannes SchindelinUpdate the submodules in preparation for 1.7.10
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-04-10 Johannes Schindelinrun-tests: run more tests in parallel
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-03-17 Johannes SchindelinFix net installer's profile.d copying
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-03-16 Johannes SchindelinLet the net installer optionally bundle profile.d/...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-03-16 Johannes SchindelinFix path to file(1)'s magic file
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-02-23 Johannes SchindelinAdd a README.md file (so that our GitHub repository...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2012-02-23 Johannes SchindelinMerge remote-tracking branch 'atnak/an/vim-utf-8' into...
commit | commitdiff | tree
2012-01-05 Johannes Schindelinrebasing-merge: make the finish-rebasing-merge.sh executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-11-02 Johannes Schindelinrun-tests: remove MSVC-leftovers which would make the...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-11-01 Johannes Schindelinmsvc-build: add 'clean' subcommand
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-11-01 Johannes Schindelinmsvc-build: optionally start the Visual Studio
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-11-01 Johannes Schindelinmsvc-build: use compat.mak to add the includes/libs
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-11-01 Johannes SchindelinAdd a script to make the MSVC build more convenient
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-10-26 Johannes Schindelinapply-from-gmane: also handle thread.gmane.org URLs
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-10-26 Johannes SchindelinMark shell scripts executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-27 Johannes Schindelinvimrc: reinstate that super-useful highlighting of...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-16 Johannes Schindelinvimrc: use the 'diff' syntax highlighting; 'gitdiff...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-12 Johannes SchindelinWe moved to github.com
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-12 Johannes SchindelinAdd github.com's certificate to cURL's ca-bundle
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-09 Johannes Schindelinwine-start: avoid going through msys.bat
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-08 Johannes SchindelinSet vim's textwidth for gitcommits in vimrc
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-08 Johannes SchindelinInstall the gvim portion of vim73
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-09-08 Johannes SchindelinWhen compiling vim, also compile & install gvim
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-08-11 Johannes SchindelinMerge remote-tracking branch 'origin/devel' into devel
 commit | commitdiff | tree
2011-08-11 Johannes SchindelinHelp 'file' find its magic file
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-08-06 Johannes Schindelinrebasing-merge: specify all commits explicitly
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-07-20 Johannes SchindelinUpdate submodules
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-07-20 Johannes SchindelinInclude libiconv-2.dll in the net installer, not libiconv2.dll
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-07-14 Johannes SchindelinDescribe the known MSYS_WATCH_FSTAB issue
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-06-04 Johannes Schindelinrebasing-merge: make sure rebase is called with --autosquash
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-06-01 Johannes Schindelinrebasing-merge.sh: Fix arguments to 'rebase'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-31 Johannes SchindelinMerge branch 'work/relative-paths' of git://repo.or...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-30 Johannes SchindelinWinGit/release.sh: fix final message when running in...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-30 Johannes SchindelinWinGit/release.sh: test for minimal WINE version
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-30 Johannes SchindelinCall InnoSetup with WINE if it is not executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-30 Johannes SchindelinMark a few shell scripts executable
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-22 Johannes SchindelinVI: add 76-column word-wrap to the Git Commit mode
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-21 Johannes SchindelinUpdated bash.exe to MSYS-gca78a7c
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-05-21 Johannes SchindelinUpdated msys-1.0.dll to MSYS-gca78a7c
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-04-29 Johannes SchindelinWinGit release scripts: avoid absolute paths
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-03-29 Johannes SchindelinInclude rebase.exe in the releases
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-03-22 Johannes Schindelinrebasing-merge: look harder for previous rebasing merge
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-03-22 Johannes SchindelinTurn on rebase's autosquash option by default
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-03-22 Johannes SchindelinFix zlib compilation for 64-bit
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-03-18 Johannes SchindelinUpdate w64 fetch script to current mingw-w64
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-01-19 Johannes Schindelinwine-start: optionally rebase the msys-1.0.dll first
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-01-17 Johannes SchindelinAdd a super-simple pseudo 'ldd'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-01-17 Johannes SchindelinAdd a convenience script to start msysGit in WINE
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-01-17 Johannes SchindelinAdd the rebase.exe tool to be able to fix msys-1.0.dll
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2011-01-17 Johannes SchindelinAdd /src/rebase
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-22 Johannes SchindelinWine: do not use intelligent Git prompt
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-22 Johannes SchindelinWine: avoid problems with inherited LS_COLORS
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-22 Johannes SchindelinMinGWify 'depends'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-22 Johannes SchindelinAdd initial 'depends' sources from w00depends
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-20 Johannes SchindelinInstall antiword (Git 0680e7ee62e430e0905085e5b4cfb01d31db5936)
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-12-20 Johannes SchindelinInstall poppler-0.14.5.tar.gz
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-08-11 Johannes Schindelinrebasing-merge: require --force to rebase without new...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-07-05 Johannes Schindelinrun-tests: adjust generate_skip_list for new test output...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-07-05 Johannes Schindelinrun-tests: prepare for new 'make test' output format
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-07-05 Johannes Schindelinrebasing-merge: in case of an error, write out a finish...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-07-05 Johannes Schindelinrebasing-merge: allow other upstream branches than...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-06-13 Johannes SchindelinRedirect /dev/null to stdin for run-tests.sh
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-06-12 Johannes SchindelinUpdate docs for upcoming release
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2010-06-12 Johannes SchindelinMake /share/WinGit/release.sh callable from anywhere...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
next
msysGit -- the development environment for 'Git for Windows'