summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-012-15/+15
| * | | | | | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-311-4/+0
| * | | | | | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-311-4/+4
| * | | | | | | | | recursive submodules: test for relative pathsStefan Beller2016-03-311-0/+41
* | | | | | | | | | Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-022-7/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-042-7/+24
* | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano2016-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patchEric Sunshine2016-04-041-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-026-3/+98
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | set_worktree_head_symref(): fix error messageky/branch-m-worktreeKazuki Yamaguchi2016-04-081-1/+2
| * | | | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-044-3/+53
| * | | | | | | | | | | refs: add a new function set_worktree_head_symrefKazuki Yamaguchi2016-04-042-0/+44
* | | | | | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-022-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-292-8/+20
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-027-114/+167
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | verify_repository_format: mark messages for translationjk/check-repository-formatJeff King2016-03-111-2/+2
| * | | | | | | | | | | | setup: drop repository_format_version globalJeff King2016-03-113-3/+0
| * | | | | | | | | | | | setup: unify repository version callbacksJeff King2016-03-112-43/+23
| * | | | | | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-111-9/+12
| * | | | | | | | | | | | setup: refactor repo format reading and verificationJeff King2016-03-112-39/+103
| * | | | | | | | | | | | config: drop git_config_earlyJeff King2016-03-113-16/+4
| * | | | | | | | | | | | check_repository_format_gently: stop using git_config_earlyJeff King2016-03-111-8/+3
| * | | | | | | | | | | | lazily load core.sharedrepositoryJeff King2016-03-112-2/+9
| * | | | | | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-115-20/+33
| * | | | | | | | | | | | setup: document check_repository_format()Jeff King2016-03-112-3/+10
* | | | | | | | | | | | | Merge branch 'ew/send-email-readable-message-id' into maintJunio C Hamano2016-05-021-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | send-email: more meaningful Message-IDew/send-email-readable-message-idEric Wong2016-04-061-2/+3
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Git 2.8.2v2.8.2Junio C Hamano2016-04-294-3/+19
* | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano2016-04-292-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes()js/mingw-tests-2.8Johannes Sixt2016-04-042-11/+3
* | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano2016-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fixElia Pinto2016-04-051-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano2016-04-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderrJunio C Hamano2016-04-051-2/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano2016-04-291-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule-config: use hashmap_iter_first()ak/use-hashmap-iter-first-in-submodule-configAlexander Kuleshov2016-03-231-2/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-292-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-052-0/+15
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-292-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-312-1/+13
* | | | | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-292-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renamesSZEDER Gábor2016-03-302-2/+15
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ss/msvc' into maintJunio C Hamano2016-04-293-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | MSVC: use shipped headers instead of fallback definitionsss/msvcSven Strickroth2016-03-302-1/+5
| * | | | | | | | | | | | | | | MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreSven Strickroth2016-03-301-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-04-251-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin2016-04-241-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9 from vascool/frJean-Noël Avila2016-03-251-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | l10n: fr: don't translate "merge" as a parameterVasco Almeida2016-03-251-1/+1
| | | * | | | | | | | | | | | | | | l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida2016-03-251-1/+1