summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-012-0/+2
* 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
| * | | | | config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| * | | | | read-cache.c: drop PROT_WRITE from mmap of indexJeff King2015-05-281-1/+1
| |/ / / /
* | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-257-9/+34
|\ \ \ \ \
| * | | | | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachableJeff King2015-06-011-1/+1
| * | | | | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-013-2/+17
| * | | | | add quieter versions of parse_{tree,commit}Jeff King2015-06-014-6/+16
| |/ / / /
* | | | | Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-252-41/+58
|\ \ \ \ \
| * | | | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-execJunio C Hamano2015-05-221-40/+40
| * | | | | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-222-6/+6
| * | | | | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-221-0/+17
* | | | | | 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