Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-02-22 | 6 | -10/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pw/completion-stash' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mm/clean-doc-fix' into maint | Junio C Hamano | 2016-02-22 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dw/mergetool-vim-window-shuffle' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/stripspace-optstring' into maint | Junio C Hamano | 2016-02-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/git-remote-add-url-insteadof-test' | Junio C Hamano | 2016-02-22 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t5505: 'remote add x y' should work when url.y.insteadOf = xjs/git-remote-add-url-insteadof-test | Johannes Schindelin | 2016-02-17 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/config-include' | Junio C Hamano | 2016-02-22 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | git-config: better document default behavior for `--include`jk/config-include | Jeff King | 2016-02-13 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | Merge branch 'ew/connect-verbose' | Junio C Hamano | 2016-02-22 | 1 | -2/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t5570: add tests for "git {clone,fetch,pull} -v"ew/connect-verbose | Eric Wong | 2016-02-15 | 1 | -2/+20 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn | Junio C Hamano | 2016-02-22 | 4 | -14/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | git-svn: apply "svn.pathnameencoding" before URL encoding | Kazutoshi Satoda | 2016-02-22 | 2 | -1/+17 | |
| * | | | | | | | | | | | | | | | | git-svn: enable "svn.pathnameencoding" on dcommit | Kazutoshi Satoda | 2016-02-22 | 2 | -2/+24 | |
| * | | | | | | | | | | | | | | | | git-svn: hoist out utf8 prep from t9129 to lib-git-svn | Eric Wong | 2016-02-22 | 2 | -11/+13 | |
* | | | | | | | | | | | | | | | | | Merge branch 'pw/completion-stash' | Junio C Hamano | 2016-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stash | SZEDER Gábor | 2016-02-22 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2016-02-17 | 2 | -1/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Start preparing for 2.7.2 | Junio C Hamano | 2016-02-17 | 2 | -1/+28 | |
| * | | | | | | | | | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maint | Junio C Hamano | 2016-02-17 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'aw/push-force-with-lease-reporting' into maint | Junio C Hamano | 2016-02-17 | 2 | -12/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/do-not-move-worktree-manually' into maint | Junio C Hamano | 2016-02-17 | 3 | -21/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/xmerge-marker-eol' into maint | Junio C Hamano | 2016-02-17 | 2 | -18/+93 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git-cvsserver.perl: fix typo | GyuYong Jung | 2016-02-17 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Seventh batch for the 2.8 cycle | Junio C Hamano | 2016-02-17 | 1 | -0/+43 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dw/mergetool-vim-window-shuffle' | Junio C Hamano | 2016-02-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffle | Dickson Wong | 2016-02-12 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ah/stripspace-optstring' | Junio C Hamano | 2016-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | stripspace: call U+0020 a "space" instead of a "blank"ah/stripspace-optstring | Alex Henrie | 2016-01-29 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'mm/clean-doc-fix' | Junio C Hamano | 2016-02-17 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Documentation/git-clean.txt: don't mention deletion of .git/modules/*mm/clean-doc-fix | Matt McCutchen | 2016-02-09 | 1 | -3/+1 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/rerere-xsnprintf' | Junio C Hamano | 2016-02-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | rerere: replace strcpy with xsnprintfjk/rerere-xsnprintf | Jeff King | 2016-02-08 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/test-path-utils-xsnprintf' | Junio C Hamano | 2016-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | test-path-utils: use xsnprintf in favor of strcpyjk/test-path-utils-xsnprintf | Jeff King | 2016-02-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly' | Junio C Hamano | 2016-02-17 | 3 | -22/+89 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | ident: add user.useConfigOnly boolean for when ident shouldn't be guessed | Dan Aloni | 2016-02-08 | 3 | -0/+65 | |
| * | | | | | | | | | | | | | | | | | | fmt_ident: refactor strictness checks | Jeff King | 2016-02-04 | 1 | -22/+24 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias' | Junio C Hamano | 2016-02-17 | 2 | -18/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | restore_env(): free the saved environment variable once we are done | Junio C Hamano | 2016-02-02 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | git: simplify environment save/restore logic | Junio C Hamano | 2016-01-27 | 1 | -14/+13 | |
| * | | | | | | | | | | | | | | | | | | git: protect against unbalanced calls to {save,restore}_env() | Junio C Hamano | 2016-01-27 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | git: remove an early return from save_env_before_alias() | Junio C Hamano | 2016-01-27 | 2 | -2/+52 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg/mingw-test-fix' | Junio C Hamano | 2016-02-17 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | t9100: fix breakage when SHELL_PATH is not /bin/shmg/mingw-test-fix | Michael J Gruber | 2016-02-08 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests' | Junio C Hamano | 2016-02-17 | 29 | -70/+197 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | gitignore: ignore generated test-fake-ssh executable | Johannes Schindelin | 2016-02-08 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | mingw: do not bother to test funny file names | Johannes Schindelin | 2016-01-28 | 8 | -5/+9 | |
| * | | | | | | | | | | | | | | | | | | | mingw: skip a test in t9130 that cannot pass on Windows | Johannes Schindelin | 2016-01-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | mingw: handle the missing POSIXPERM prereq in t9124 | Johannes Schindelin | 2016-01-28 | 1 | -6/+10 |