summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: remove "push.default is unset" warning messagemm/push-default-warningMatthieu Moy2016-02-251-34/+0
* tests: remove no-op full-svn-test targetEric Wong2016-02-231-6/+0
* Sync with 2.7.2Junio C Hamano2016-02-222-1/+16
|\
| * Git 2.7.2v2.7.2Junio C Hamano2016-02-223-2/+17
| * Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-226-10/+6
| |\
| * \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-221-2/+2
| |\ \
| * \ \ Merge branch 'mm/clean-doc-fix' into maintJunio C Hamano2016-02-221-3/+1
| |\ \ \
| * \ \ \ Merge branch 'dw/mergetool-vim-window-shuffle' into maintJunio C Hamano2016-02-221-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'js/git-remote-add-url-insteadof-test'Junio C Hamano2016-02-221-0/+5
|\ \ \ \ \ \ \
| * | | | | | | t5505: 'remote add x y' should work when url.y.insteadOf = xjs/git-remote-add-url-insteadof-testJohannes Schindelin2016-02-171-0/+5
* | | | | | | | Merge branch 'jk/config-include'Junio C Hamano2016-02-221-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | git-config: better document default behavior for `--include`jk/config-includeJeff King2016-02-131-1/+3
* | | | | | | | | Merge branch 'ew/connect-verbose'Junio C Hamano2016-02-221-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5570: add tests for "git {clone,fetch,pull} -v"ew/connect-verboseEric Wong2016-02-151-2/+20
* | | | | | | | | | Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svnJunio C Hamano2016-02-224-14/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: apply "svn.pathnameencoding" before URL encodingKazutoshi Satoda2016-02-222-1/+17
| * | | | | | | | | | git-svn: enable "svn.pathnameencoding" on dcommitKazutoshi Satoda2016-02-222-2/+24
| * | | | | | | | | | git-svn: hoist out utf8 prep from t9129 to lib-git-svnEric Wong2016-02-222-11/+13
* | | | | | | | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stashSZEDER Gábor2016-02-221-2/+2
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2016-02-172-1/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Start preparing for 2.7.2Junio C Hamano2016-02-172-1/+28
| * | | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /