summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-docTorsten Bögershausen2015-06-171-1/+5
* Git 2.4.4v2.4.4Junio C Hamano2015-06-164-3/+39
* Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
|\
| * clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2
| * clone: use OPT_STRING_LIST for --referenceJeff King2015-05-271-11/+2
* | Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-161-28/+22
|\ \
| * | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
* | | Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-161-0/+16
|\ \ \
| * | | glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
| |/ /
* | | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
|\ \ \
| * | | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-032-2/+2
* | | | Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-161-1/+1
|\ \ \ \
| * | | | Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | | | | Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-167-26/+9
|\ \ \ \ \
| * | | | | dir: remove unused variable sbrs/janitorialRené Scharfe2015-05-201-2/+0
| * | | | | clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
| * | | | | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-205-22/+9
* | | | | | Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-06-161-1/+1
|\ \ \ \ \ \
| * | | | | | test_bitmap_walk: free bitmap with bitmap_freesb/test-bitmap-free-at-endJeff King2015-05-221-1/+1
* | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
|\ \ \ \ \ \ \
| * | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstatDavid Turner2015-05-181-3/+3
* | | | | | | | Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-163-29/+139
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-253-29/+139
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-253-29/+139
| | |\ \ \ \ \ \ \
| | | * | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-253-11/+105
| | | * | | | | | | t5551: factor out tag creationJeff King2015-05-201-13/+21
| | | * | | | | | | http-backend: fix die recursion with custom handlerJeff King2015-05-151-5/+9
* | | | | | | | | | Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-162-1/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-182-1/+27
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-162-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: recognize "--help" for subcommandsjk/stash-optionsJeff King2015-05-201-0/+11
| * | | | | | | | | | stash: complain about unknown flagsJeff King2015-05-202-1/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-162-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-docMatthieu Moy2015-05-201-1/+4
| * | | | | | | | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-181-1/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano2015-06-161-1/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...ep/do-not-feed-a-pointer-to-array-sizeElia Pinto2015-05-051-1/+53
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano2015-06-141-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber2015-06-121-1/+1
| * | | | | | | | | | l10n: de.po: punctuation fixesMichael J Gruber2015-06-121-2/+2
| * | | | | | | | | | l10n: de.po: grammar fixMichael J Gruber2015-06-121-1/+1
| * | | | | | | | | | l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz2015-06-121-1/+1
* | | | | | | | | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-054-3/+80
* | | | | | | | | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-messageDanny Lin2015-05-061-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-058-35/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curlJunio C Hamano2015-05-072-0/+7
| * | | | | | | | | | | t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-077-35/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: fix inconsistent spelling of "packfile"ps/doc-packfile-vs-pack-filePatrick Steinhardt2015-05-222-3/+3
View Lorry Controller Status