summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* doc: prefer 'stash push' over 'stash save'tg/deprecate-stash-savePhil Hord2017-11-221-2/+2
* stash: remove now superfluos help for "stash push"Thomas Gummerer2017-10-271-12/+1
* stash: mark "git stash save" deprecated in the man pageThomas Gummerer2017-10-271-3/+6
* stash: replace "git stash save" with "git stash push" in the documentationThomas Gummerer2017-10-274-13/+13
* Git 2.15-rc2v2.15.0-rc2Junio C Hamano2017-10-192-1/+13
* Merge branch 'jc/branch-force-doc-readability-fix'Junio C Hamano2017-10-191-2/+2
|\
| * branch doc: sprinkle a few commas for readabilityjc/branch-force-doc-readability-fixJunio C Hamano2017-10-181-2/+2
* | Merge branch 'dg/filter-branch-filter-order-doc'Junio C Hamano2017-10-192-16/+16
|\ \
| * | doc: list filter-branch subdirectory-filter firstdg/filter-branch-filter-order-docDavid Glasser2017-10-182-20/+20
| |/
* | Merge branch 'jc/fetch-refspec-doc-update'Junio C Hamano2017-10-191-2/+4
|\ \
| * | fetch doc: src side of refspec could be full SHA-1jc/fetch-refspec-doc-updateJunio C Hamano2017-10-181-2/+4
* | | Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2017-10-192-6/+6
|\ \ \
| * | | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'wk/merge-options-gpg-sign-docW. Trevor King2017-10-122-6/+6
| | |/ | |/|
* | | Sync with maintJunio C Hamano2017-10-182-46/+75
|\ \ \
| * | | Prepare for 2.14.3Junio C Hamano2017-10-182-1/+76
| * | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-1823-71/+103
| |\ \ \
| * \ \ \ Merge branch 'jc/doc-checkout' into maintJunio C Hamano2017-10-181-14/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'tb/complete-describe' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/rs-mailmap' into maintJunio C Hamano2017-10-181-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2017-10-182-4/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano2017-10-181-2/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-181-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/qsort-s' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/strbuf-doc-re-reuse' into maintJunio C Hamano2017-10-181-2/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/run-command-use-alloc-array' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/tag-null-pointer-arith-fix' into maintJunio C Hamano2017-10-181-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/cocci-de-paren-call-params' into maintJunio C Hamano2017-10-181-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/doc-markup-fix' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano2017-10-185-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/validate-headref-fix' into maintJunio C Hamano2017-10-181-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/doc-use-camelcase-for-config-name' into maintJunio C Hamano2017-10-182-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maintJunio C Hamano2017-10-181-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hn/typofix' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano2017-10-181-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ez/doc-duplicated-words-fix' into maintJunio C Hamano2017-10-184-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kd/doc-for-each-ref' into maintJunio C Hamano2017-10-181-16/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano2017-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/system-path-cleanup' into maintJunio C Hamano2017-10-181-14/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bb/doc-eol-dirty' into maintJunio C Hamano2017-10-181-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/pkt-line-leakfix' into maintJunio C Hamano2017-10-181-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-lockfile-leak-fix' into maintJunio C Hamano2017-10-181-17/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/diff-highlight-makefile-fix' into maintJunio C Hamano2017-10-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano2017-10-185-244/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2017-10-182-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rb/compat-poll-fix' into maintJunio C Hamano2017-10-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/memfixes' into maintJunio C Hamano2017-10-183-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2017-10-182-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-x-theirs-docfix' into maintJunio C Hamano2017-10-181-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/mailinfo-qp-decode-fix' into maintJunio C Hamano2017-10-181-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \