summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* .mailmap: update to my shorter email addressew/normal-to-eEric Wong2016-05-021-0/+1
* 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
| | | * | | | | | l10n: fr: fix wrongly translated option nameVasco Almeida2016-03-251-2/+2
| | | * | | | | | l10n: fr: fix transcation of "dir"Vasco Almeida2016-03-251-1/+1
| | |/ / / / / /
* | | | | | | | Prepare for 2.8.2Junio C Hamano2016-04-141-0/+38
* | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-142-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-232-5/+15
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-142-1/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-212-1/+38
* | | | | | | | | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: ignore trailing whitespace in mailrc alias filejk/send-email-rtrim-mailrc-aliasJeff King2016-03-181-1/+1
* | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-142-4/+85
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-102-1/+35
| * | | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-102-3/+50
* | | | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-1413-26/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use setup_git_directory() in test-* programsjk/startup-infoJeff King2016-03-072-0/+4
| * | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-072-2/+31
| * | | | | | | | | | | mailmap: do not resolve blobs in a non-repositoryJeff King2016-03-061-1/+2
| * | | | | | | | | | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-061-5/+6
| * | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-062-1/+4
| * | | | | | | | | | | setup: make startup_info available everywhereJeff King2016-03-066-17/+7
* | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-142-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-emptyJeff King2016-03-052-1/+11
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepathRamsay Jones2016-03-041-0/+1
| * | | | | | | | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-041-1/+1
* | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-143-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetchGabriel Souza Franco2016-03-051-0/+4