aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'nd/git-common-dir-fix'Junio C Hamano2016-02-24
|\
| * rev-parse: take prefix into account in --git-common-dirNguyễn Thái Ngọc Duy2016-02-12
* | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2016-02-24
|\ \
| * | get_sha1: don't die() on bogus search stringsJeff King2016-02-10
| * | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-10
| * | checkout: reorder check_filename conditionalJeff King2016-02-10
* | | tests: remove no-op full-svn-test targetEric Wong2016-02-23
* | | Sync with 2.7.2Junio C Hamano2016-02-22
|\ \ \
| * | | Git 2.7.2v2.7.2Junio C Hamano2016-02-22
| * | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-22
| |\ \ \
| * \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-22
| |\ \ \ \
| * \ \ \ \ Merge branch 'mm/clean-doc-fix' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dw/mergetool-vim-window-shuffle' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'js/git-remote-add-url-insteadof-test'Junio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5505: 'remote add x y' should work when url.y.insteadOf = xJohannes Schindelin2016-02-17
* | | | | | | | | | Merge branch 'jk/config-include'Junio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-config: better document default behavior for `--include`Jeff King2016-02-13
* | | | | | | | | | | Merge branch 'ew/connect-verbose'Junio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5570: add tests for "git {clone,fetch,pull} -v"Eric Wong2016-02-15
* | | | | | | | | | | | Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svnJunio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-svn: apply "svn.pathnameencoding" before URL encodingKazutoshi Satoda2016-02-22
| * | | | | | | | | | | | git-svn: enable "svn.pathnameencoding" on dcommitKazutoshi Satoda2016-02-22
| * | | | | | | | | | | | git-svn: hoist out utf8 prep from t9129 to lib-git-svnEric Wong2016-02-22
* | | | | | | | | | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | completion: fix mis-indentation in _git_stash()SZEDER Gábor2016-02-22
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Start preparing for 2.7.2Junio C Hamano2016-02-17
| * | | | | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/do-not-move-worktree-manually' into maintJunio C Hamano2016-02-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-cvsserver.perl: fix typoGyuYong Jung2016-02-17
* | | | | | | | | | | | | | | | Seventh batch for the 2.8 cycleJunio C Hamano2016-02-17
* | | | | | | | | | | | | | | | Merge branch 'dw/mergetool-vim-window-shuffle'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong2016-02-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ah/stripspace-optstring'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | stripspace: call U+0020 a "space" instead of a "blank"Alex Henrie2016-01-29
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mm/clean-doc-fix'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation/git-clean.txt: don't mention deletion of .git/modules/*Matt McCutchen2016-02-09
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/rerere-xsnprintf'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rerere: replace strcpy with xsnprintfJeff King2016-02-08
* | | | | | | | | | | | | | Merge branch 'jk/test-path-utils-xsnprintf'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test-path-utils: use xsnprintf in favor of strcpyJeff King2016-02-08
* | | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | ident: add user.useConfigOnly boolean for when ident shouldn't be guessedDan Aloni2016-02-08
| * | | | | | | | | | | | | | | fmt_ident: refactor strictness checksJeff King2016-02-04
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias'Junio C Hamano2016-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | restore_env(): free the saved environment variable once we are doneJunio C Hamano2016-02-02
| * | | | | | | | | | | | | | | git: simplify environment save/restore logicJunio C Hamano2016-01-27