summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: ignore log.date configurationda/subtree-date-confusionDavid Aguilar2015-07-232-1/+5
* Git 2.4.6v2.4.6Junio C Hamano2015-07-154-3/+27
* Merge branch 'mm/describe-doc' into maintJunio C Hamano2015-07-151-1/+1
|\
| * Documentation/describe: improve one-line summarymm/describe-docMatthieu Moy2015-06-161-1/+1
* | Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano2015-07-151-0/+4
|\ \
| * | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separatorJoe Cridge2015-06-101-0/+4
* | | Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano2015-07-154-29/+29
|\ \ \
| * | | ewah: use less generic macro namees/osx-header-pollutes-mask-macroJeff King2015-06-034-23/+23
| * | | ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine2015-06-031-8/+8
* | | | Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano2015-07-151-1/+3
|\ \ \ \
| * | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaroundEric Sunshine2015-06-051-1/+3
| |/ / /
* | | | Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \
| * | | | doc: format-patch: fix typofk/doc-format-patch-vnFrans Klaver2015-06-101-1/+1
* | | | | Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \
| * | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanityPaul Tan2015-06-121-1/+1
* | | | | | Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \
| * | | | | | fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safetyMike Edgar2015-06-171-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-14/+20
|\ \ \ \ \ \
| * | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
| * | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* | | | | | | Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobberAriel Faigon2015-06-091-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osxPanagiotis Astithas2015-06-121-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-152-6/+14
|\ \ \ \ \ \ \
| * | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-012-6/+14
| |/ / / / / /
* | | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-252-9/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-indexJeff King2015-06-152-9/+0
* | | | | | | | Merge branch 'cb/array-size' into maintJunio C Hamano2015-06-251-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-sizeCharles Bailey2015-06-241-5/+3
* | | | | | | | | Git 2.4.5v2.4.5Junio C Hamano2015-06-254-3/+32
* | | | | | | | | Merge branch 'sg/merge-summary-config' into maintJunio C Hamano2015-06-253-16/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-configSZEDER Gábor2015-05-283-16/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano2015-06-251-24/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: silence perl/PM.stamp recipejk/make-fix-dependenciesJeff King2015-05-291-1/+1
| * | | | | | | | | Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSJeff King2015-05-291-21/+22
| * | | | | | | | | Makefile: drop dependency between git-instaweb and gitwebJeff King2015-05-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano2015-06-251-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/technical/pack-protocol: mention http as possible protocolsb/pack-protocol-mention-smart-httpStefan Beller2015-06-021-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-252-10/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | setup_git_directory: delay core.bare/core.worktree errorsjk/die-on-bogus-worktree-lateJeff King2015-05-292-10/+26
| |/ / / / / / / /
* | | | | | | | | Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano2015-06-251-9/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: remove --tags error in no merge candidates casept/pull-tags-error-diagPaul Tan2015-05-141-9/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-255-22/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-274-20/+20
| * | | | | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-272-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-254-11/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failureJunio C Hamano2015-05-281-1/+1
| * | | | | | | | | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * | | | | | | | | config.c: avoid xmmap error messagesJeff King2015-05-283-6/+21