summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule--helper: fix typo in is_active error messagebw/submodule-is-activeStefan Beller2017-04-131-1/+1
* submodule add: respect submodule.active and submodule.<name>.activeBrandon Williams2017-03-182-0/+35
* submodule--helper init: set submodule.<name>.activeBrandon Williams2017-03-182-0/+23
* clone: teach --recurse-submodules to optionally take a pathspecBrandon Williams2017-03-183-12/+120
* submodule init: initialize active submodulesBrandon Williams2017-03-183-1/+90
* submodule: decouple url and submodule interestBrandon Williams2017-03-183-10/+110
* submodule--helper clone: check for configured submodules using helperBrandon Williams2017-03-171-12/+3
* submodule sync: use submodule--helper is-activeBrandon Williams2017-03-171-2/+2
* submodule sync: skip work for inactive submodulesBrandon Williams2017-03-171-17/+21
* submodule status: use submodule--helper is-activeBrandon Williams2017-03-171-2/+1
* submodule--helper: add is-active subcommandBrandon Williams2017-03-172-0/+42
* Third batch after 2.12Junio C Hamano2017-03-121-0/+39
* Merge branch 'ah/doc-ls-files-quotepath'Junio C Hamano2017-03-129-39/+48
|\
| * Documentation: improve description for core.quotePathah/doc-ls-files-quotepathAndreas Heiduk2017-03-029-39/+48
* | Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano2017-03-122-1/+27
|\ \
| * | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()jc/diff-populate-filespec-size-only-fixJunio C Hamano2017-03-022-1/+27
* | | Merge branch 'vn/line-log-memcpy-size-fix'Junio C Hamano2017-03-121-1/+2
|\ \ \
| * | | line-log: use COPY_ARRAY to fix mis-sized memcpyvn/line-log-memcpy-size-fixVegard Nossum2017-03-061-1/+2
* | | | Merge branch 'jk/ewah-use-right-type-in-sizeof'Junio C Hamano2017-03-121-2/+2
|\ \ \ \
| * | | | ewah: fix eword_t/uint64_t confusionjk/ewah-use-right-type-in-sizeofJeff King2017-03-061-2/+2
* | | | | Merge branch 'ax/line-log-range-merge-fix'Junio C Hamano2017-03-122-8/+17
|\ \ \ \ \
| * | | | | line-log.c: prevent crash during union of too many rangesax/line-log-range-merge-fixAllan Xavier2017-03-032-8/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'ss/remote-bzr-hg-placeholder-wo-python'Junio C Hamano2017-03-122-18/+14
|\ \ \ \ \
| * | | | | contrib: git-remote-{bzr,hg} placeholders don't need Pythonss/remote-bzr-hg-placeholder-wo-pythonSebastian Schuberth2017-03-032-18/+14
* | | | | | Merge branch 'js/realpath-pathdup-fix'Junio C Hamano2017-03-129-17/+25
|\ \ \ \ \ \
| * | | | | | real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-089-18/+18
| * | | | | | t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREEJohannes Schindelin2017-03-081-0/+8
| |/ / / / /
* | | | | | Merge branch 'jk/add-i-patch-do-prompt'Junio C Hamano2017-03-122-4/+22
|\ \ \ \ \ \
| * | | | | | add--interactive: fix missing file prompt for patch mode with "-i"jk/add-i-patch-do-promptJeff King2017-03-022-4/+22
| |/ / / / /
* | | | | | Merge branch 'jh/mingw-openssl-sha1'Junio C Hamano2017-03-121-1/+0
|\ \ \ \ \ \
| * | | | | | mingw: use OpenSSL's SHA-1 routinesjh/mingw-openssl-sha1Jeff Hostetler2017-02-091-1/+0
* | | | | | | Second batch after 2.12Junio C Hamano2017-03-101-0/+65
* | | | | | | Merge branch 'rs/log-email-subject'Junio C Hamano2017-03-106-31/+32
|\ \ \ \ \ \ \
| * | | | | | | pretty: use fmt_output_email_subject()rs/log-email-subjectRené Scharfe2017-03-016-15/+15
| * | | | | | | log-tree: factor out fmt_output_email_subject()René Scharfe2017-03-012-20/+21
| |/ / / / / /
* | | | | | | Merge branch 'tg/stash-push'Junio C Hamano2017-03-104-30/+274
|\ \ \ \ \ \ \
| * | | | | | | stash: allow pathspecs in the no verb formtg/stash-pushThomas Gummerer2017-02-283-4/+25
| * | | | | | | stash: use stash_push for no verb formThomas Gummerer2017-02-283-15/+13
| * | | | | | | stash: teach 'push' (and 'create_stash') to honor pathspecThomas Gummerer2017-02-284-12/+153
| * | | | | | | stash: refactor stash_createThomas Gummerer2017-02-191-4/+18
| * | | | | | | stash: add test for the create command line argumentsThomas Gummerer2017-02-191-0/+18
| * | | | | | | stash: introduce push verbThomas Gummerer2017-02-193-3/+55
* | | | | | | | Merge branch 'sb/submodule-init-url-selection'Junio C Hamano2017-03-102-19/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule init: warn about falling back to a local pathsb/submodule-init-url-selectionStefan Beller2017-02-282-19/+27
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rj/remove-unused-mktemp'Junio C Hamano2017-03-106-60/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | wrapper.c: remove unused gitmkstemps() functionrj/remove-unused-mktempRamsay Jones2017-02-285-40/+0
| * | | | | | | | wrapper.c: remove unused git_mkstemp() functionRamsay Jones2017-02-282-20/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'ew/markdown-url-in-readme'Junio C Hamano2017-03-101-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | README: create HTTP/HTTPS links from URLs in Markdownew/markdown-url-in-readmeEric Wong2017-03-011-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ps/docs-diffcore'Junio C Hamano2017-03-101-5/+5
|\ \ \ \ \ \ \ \