aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Git 2.8.2v2.8.2Junio C Hamano2016-04-29
* Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano2016-04-29
|\
| * Windows: shorten code by re-using convert_slashes()Johannes Sixt2016-04-04
* | Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano2016-04-29
|\ \
| * | api-trace.txt: fix typoElia Pinto2016-04-05
* | | Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano2016-04-29
|\ \ \
| * | | Makefile: fix misdirected redirectionsJunio C Hamano2016-04-05
| |/ /
* | | Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano2016-04-29
|\ \ \
| * | | submodule-config: use hashmap_iter_first()Alexander Kuleshov2016-03-23
* | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-29
|\ \ \ \
| * | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |/ / | |/| |
* | | | Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-29
|\ \ \ \
| * | | | git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2016-03-31
* | | | | Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-29
|\ \ \ \ \
| * | | | | diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2016-03-30
| | |/ / / | |/| | |
* | | | | Merge branch 'ss/msvc' into maintJunio C Hamano2016-04-29
|\ \ \ \ \
| * | | | | MSVC: use shipped headers instead of fallback definitionsSven Strickroth2016-03-30
| * | | | | MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreSven Strickroth2016-03-30
* | | | | | Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-04-25
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin2016-04-24
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #9 from vascool/frJean-Noël Avila2016-03-25
| | |\ \ \ \ \ \
| | | * | | | | | l10n: fr: don't translate "merge" as a parameterVasco Almeida2016-03-25
| | | * | | | | | l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida2016-03-25
| | | * | | | | | l10n: fr: fix wrongly translated option nameVasco Almeida2016-03-25
| | | * | | | | | l10n: fr: fix transcation of "dir"Vasco Almeida2016-03-25
| | |/ / / / / /
* | | | | | | | Prepare for 2.8.2Junio C Hamano2016-04-14
* | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsSven Strickroth2016-03-21
* | | | | | | | | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: ignore trailing whitespace in mailrc alias fileJeff King2016-03-18
* | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2016-03-10
| * | | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-10
* | | | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use setup_git_directory() in test-* programsJeff King2016-03-07
| * | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-07
| * | | | | | | | | | | mailmap: do not resolve blobs in a non-repositoryJeff King2016-03-06
| * | | | | | | | | | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-06
| * | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-06
| * | | | | | | | | | | setup: make startup_info available everywhereJeff King2016-03-06
* | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorJeff King2016-03-05
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | xdiff/xprepare: fix a memory leakRamsay Jones2016-03-04
| * | | | | | | | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-04
* | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsGabriel Souza Franco2016-03-05
| * | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-01