summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-268-3/+147
|\
| * mingw: remove unnecessary definitionjs/windows-dotgitJohannes Schindelin2016-05-111-3/+0
| * mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-117-0/+147
* | Merge branch 'kf/gpg-sig-verification-doc' into maintJunio C Hamano2016-05-262-4/+7
|\ \
| * | Documentation: clarify signature verificationkf/gpg-sig-verification-docKeller Fuchs2016-05-132-4/+7
| |/
* | Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-2612-14/+14
|\ \
| * | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-0612-14/+14
| |/
* | Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
|\ \
| * | t6041: do not compress backup tar filesb/z-is-gnutar-ismStefan Beller2016-05-091-2/+2
| * | t3513: do not compress backup tar fileStefan Beller2016-05-091-2/+2
* | | Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-268-61/+111
|\ \ \
| * | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updatesVasco Almeida2016-05-122-22/+56
| * | | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-191-4/+4
| * | | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-191-3/+3
| * | | i18n: git-parse-remote.sh: mark strings for translationVasco Almeida2016-04-192-18/+30
| * | | i18n: branch: move comment for translatorsVasco Almeida2016-04-131-2/+4
| * | | i18n: branch: unmark string for translationVasco Almeida2016-04-131-2/+2
| * | | i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida2016-04-121-1/+1
| * | | i18n: unpack-trees: mark strings for translationVasco Almeida2016-04-121-12/+12
| * | | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-081-1/+1
| * | | i18n: index-pack: use plural string instead of normal oneVasco Almeida2016-04-081-1/+3
| | |/ | |/|
* | | Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
|\ \ \
| * | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnamesBrian Norris2016-05-051-11/+11
| * | | config: describe 'pathname' value typejc/config-pathname-typeJunio C Hamano2016-05-041-11/+19
* | | | Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \
| * | | | remote.c: specify correct plural form in "commit diverge" messagend/remote-plural-ours-plus-theirsNguyễn Thái Ngọc Duy2016-05-061-1/+1
| |/ / /
* | | | Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \
| * | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-emptyArmin Kunaschik2016-05-091-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-261-15/+13
|\ \ \ \
| * | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seqJunio C Hamano2016-05-091-1/+6
| * | | | test-lib-functions.sh: remove misleading comment on test_seqJunio C Hamano2016-05-091-14/+7
| |/ / /
* | | | Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \
| * | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fixTorsten Bögershausen2016-05-091-1/+1
| |/ / /
* | | | Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
|\ \ \ \
| * | | | i18n: remote: add comment for translatorsva/i18n-remote-comment-to-alignVasco Almeida2016-05-091-0/+2
| | |_|/ | |/| |
* | | | Merge branch 'va/mailinfo-doc-typofix' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \
| * | | | Documentation/git-mailinfo: fix typova/mailinfo-doc-typofixVasco Almeida2016-05-111-1/+1
* | | | | Merge branch 'maint-2.7' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/war-on-sprintf' into maint-2.7Junio C Hamano2016-05-261-1/+1
| |\ \ \ \ \
| | * | | | | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintfJeff King2016-05-261-1/+1
* | | | | | | Git 2.8.3v2.8.3Junio C Hamano2016-05-184-5/+37
* | | | | | | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-186-21/+29
|\ \ \ \ \ \ \
| * | | | | | | submodule-config: don't shadow `cache`sb/misc-cleanupsStefan Beller2016-04-281-6/+6
| * | | | | | | config.c: drop local variableStefan Beller2016-04-281-4/+1
| * | | | | | | credential-cache, send_request: close fd when doneStefan Beller2016-04-011-0/+1
| * | | | | | | bundle: don't leak an fd in case of early returnStefan Beller2016-04-011-6/+17
| * | | | | | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-011-3/+1
| * | | | | | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
| |/ / / / / /
* | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-184-9/+23
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-284-9/+23