aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/git-gui-msgfmt-on-windows' into maintJunio C Hamano2017-08-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | The third batch post 2.14Junio C Hamano2017-08-23
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/format-ref-doc-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-for-each-ref: clarify peeling of tags for --formatMichael J Gruber2017-08-18
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation: use proper wording for ref format stringsMichael J Gruber2017-08-18
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | submodule.sh: remove unused variableStefan Beller2017-08-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-sane-truncate-no-more'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | diff: retire sane_truncate_fnJunio C Hamano2017-08-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/t5526-andand-chain-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t5526: fix some broken && chainsHeiko Voigt2017-08-17
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-grep: correct exit code with --quiet and -LAnthony Sottile2017-08-17
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: skip discarding the index if there is no pre-commit hookKevin Willford2017-08-16
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sha1-file-cleanup'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: make read_info_alternates staticStefan Beller2017-08-15
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/t1002-do-not-use-sum'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1002: stop using sum(1)René Scharfe2017-08-15
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | stash: prevent warning about null bytes in inputKevin Daudt2017-08-14
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | doc: clarify "config --bool" behaviour with empty stringAndreas Heiduk2017-08-14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: turn on progress option by default for format-patchKevin Willford2017-08-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: have progress option while generating patchesKevin Willford2017-08-14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/prepare-commit-msg-sample-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | hook: use correct logical variableKaartic Sivaraam2017-08-14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nm/stash-untracked'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | stash: clean untracked files before resetNicolas Morey-Chaisemartin2017-08-11
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/sha1-file-cleanup'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: remove read_packed_sha1()Jonathan Tan2017-08-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: set whence in storage-specific info fnJonathan Tan2017-08-11
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second batch post 2.14Junio C Hamano2017-08-22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/packed-ref-store'Junio C Hamano2017-08-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | files-backend: cheapen refname_available check when locking refsMichael Haggerty2017-08-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: handle a packed-refs file that is a symlinkMichael Haggerty2017-07-27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs(): die if `packed-refs` contains bogus dataMichael Haggerty2017-07-03
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3210: add some tests of bogus packed-refs file contentsMichael Haggerty2017-07-03
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack_without_refs(): don't lock or unlock the packed refsMichael Haggerty2017-07-03
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): remove call to `packed_refs_unlock()`Michael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_packed_ref_cache(): don't protest if the lock is heldMichael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_unlock(), packed_refs_is_locked(): new functionsMichael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_lock(): report errors via a `struct strbuf *err`Michael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_lock(): function renamed from lock_packed_refs()Michael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): use a staging file separate from the lockfileMichael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): report errors rather than dyingMichael Haggerty2017-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: make class into a subclass of `ref_store`Michael Haggerty2017-06-23