summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-172-12/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/do-not-move-worktree-manually' into maintJunio C Hamano2016-02-173-21/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-172-18/+93
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-cvsserver.perl: fix typoGyuYong Jung2016-02-171-1/+1
* | | | | | | | | | | | | | Seventh batch for the 2.8 cycleJunio C Hamano2016-02-171-0/+43
* | | | | | | | | | | | | | Merge branch 'dw/mergetool-vim-window-shuffle'Junio C Hamano2016-02-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffleDickson Wong2016-02-121-2/+2
* | | | | | | | | | | | | | Merge branch 'ah/stripspace-optstring'Junio C Hamano2016-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | stripspace: call U+0020 a "space" instead of a "blank"ah/stripspace-optstringAlex Henrie2016-01-291-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'mm/clean-doc-fix'Junio C Hamano2016-02-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation/git-clean.txt: don't mention deletion of .git/modules/*mm/clean-doc-fixMatt McCutchen2016-02-091-3/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/rerere-xsnprintf'Junio C Hamano2016-02-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rerere: replace strcpy with xsnprintfjk/rerere-xsnprintfJeff King2016-02-081-2/+2
* | | | | | | | | | | | | Merge branch 'jk/test-path-utils-xsnprintf'Junio C Hamano2016-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-path-utils: use xsnprintf in favor of strcpyjk/test-path-utils-xsnprintfJeff King2016-02-081-1/+1
* | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly'Junio C Hamano2016-02-173-22/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ident: add user.useConfigOnly boolean for when ident shouldn't be guessedDan Aloni2016-02-083-0/+65
| * | | | | | | | | | | | | | fmt_ident: refactor strictness checksJeff King2016-02-041-22/+24
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias'Junio C Hamano2016-02-172-18/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | restore_env(): free the saved environment variable once we are doneJunio C Hamano2016-02-021-2/+4
| * | | | | | | | | | | | | | git: simplify environment save/restore logicJunio C Hamano2016-01-271-14/+13
| * | | | | | | | | | | | | | git: protect against unbalanced calls to {save,restore}_env()Junio C Hamano2016-01-271-0/+7
| * | | | | | | | | | | | | | git: remove an early return from save_env_before_alias()Junio C Hamano2016-01-272-2/+52
* | | | | | | | | | | | | | | Merge branch 'mg/mingw-test-fix'Junio C Hamano2016-02-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t9100: fix breakage when SHELL_PATH is not /bin/shmg/mingw-test-fixMichael J Gruber2016-02-081-1/+2
* | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests'Junio C Hamano2016-02-1729-70/+197
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | gitignore: ignore generated test-fake-ssh executableJohannes Schindelin2016-02-081-0/+1
| * | | | | | | | | | | | | | | mingw: do not bother to test funny file namesJohannes Schindelin2016-01-288-5/+9
| * | | | | | | | | | | | | | | mingw: skip a test in t9130 that cannot pass on WindowsJohannes Schindelin2016-01-281-1/+1
| * | | | | | | | | | | | | | | mingw: handle the missing POSIXPERM prereq in t9124Johannes Schindelin2016-01-281-6/+10
| * | | | | | | | | | | | | | | mingw: avoid illegal filename in t9118Johannes Schindelin2016-01-281-3/+9
| * | | | | | | | | | | | | | | mingw: mark t9100's test cases with appropriate prereqsJohannes Schindelin2016-01-281-9/+9
| * | | | | | | | | | | | | | | t0008: avoid absolute pathPat Thoyts2016-01-281-1/+1
| * | | | | | | | | | | | | | | mingw: work around pwd issues in the testsJohannes Schindelin2016-01-284-16/+16
| * | | | | | | | | | | | | | | mingw: fix t9700's assumption about directory separatorsJohannes Schindelin2016-01-281-1/+1
| * | | | | | | | | | | | | | | mingw: skip test in t1508 that fails due to path conversionJohannes Schindelin2016-01-281-1/+5
| * | | | | | | | | | | | | | | tests: turn off git-daemon tests if FIFOs are not availableJohannes Schindelin2016-01-281-0/+5
| * | | | | | | | | | | | | | | mingw: disable mkfifo-based testsJohannes Schindelin2016-01-271-1/+1
| * | | | | | | | | | | | | | | mingw: accomodate t0060-path-utils for MSYS2Johannes Schindelin2016-01-271-0/+9
| * | | | | | | | | | | | | | | mingw: fix t5601-clone.shJohannes Schindelin2016-01-273-10/+39
| * | | | | | | | | | | | | | | mingw: let lstat() fail with errno == ENOTDIR when appropriateJohannes Schindelin2016-01-261-0/+39
| * | | | | | | | | | | | | | | mingw: try to delete target directory before renaming마누엘2016-01-261-1/+6
| * | | | | | | | | | | | | | | mingw: prepare the TMPDIR environment variable for shell scriptsJohannes Schindelin2016-01-261-4/+19
| * | | | | | | | | | | | | | | mingw: factor out Windows specific environment setupKarsten Blees2016-01-261-13/+17
| * | | | | | | | | | | | | | | Git.pm: stop assuming that absolute paths start with a slashJohannes Schindelin2016-01-261-1/+2
| * | | | | | | | | | | | | | | mingw: do not trust MSYS2's MinGW gettext.shJohannes Schindelin2016-01-261-0/+1
| * | | | | | | | | | | | | | | mingw: let's use gettext with MSYS2Johannes Schindelin2016-01-261-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/drop-rsync-transport'Junio C Hamano2016-02-1710-395/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | transport: drop support for git-over-rsyncjk/drop-rsync-transportJeff King2016-02-0110-395/+10
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Sixth batch for the 2.8 cycleJunio C Hamano2016-02-101-0/+40