aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-27
|\
| * t0060: sidestep surprising path mangling results on WindowsJohannes Sixt2016-10-25
| * submodule: ignore trailing slash in relative urlStefan Beller2016-10-10
| * submodule: ignore trailing slash on superproject URLStefan Beller2016-10-10
* | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-27
|\ \
| * | diff: handle sha1 abbreviations outside of repositoryJeff King2016-10-26
| * | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-26
| * | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-26
| * | find_unique_abbrev: use 4-buffer ringJeff King2016-10-26
| * | test-*-cache-tree: setup git dirJeff King2016-10-26
| * | read info/{attributes,exclude} only when in repositoryJeff King2016-10-26
* | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \
| * | | transport: compute summary-width dynamicallyJunio C Hamano2016-10-22
| * | | transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-21
| * | | fetch: pass summary_width down the callchainJunio C Hamano2016-10-21
| * | | transport: pass summary_width down the callchainJunio C Hamano2016-10-21
* | | | Merge branch 'jk/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ | |/ / /
| * | | find_unique_abbrev: move logic out of get_short_sha1()Jeff King2016-10-03
* | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | abbrev: auto size the default abbreviationLinus Torvalds2016-10-03
| * | abbrev: prepare for new world orderJunio C Hamano2016-10-03
| * | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-03
* | | Eleventh batch for 2.11Junio C Hamano2016-10-26
* | | Merge branch 'ex/deprecate-empty-pathspec-as-match-all'Junio C Hamano2016-10-26
|\ \ \
| * | | pathspec: warn on empty strings as pathspecEmily Xie2016-06-22
* | | | Merge branch 'po/fix-doc-merge-base-illustration'Junio C Hamano2016-10-26
|\ \ \ \
| * | | | doc: fix the 'revert a faulty merge' ASCII art tab spacingPhilip Oakley2016-10-24
| * | | | doc: fix merge-base ASCII art tab spacingPhilip Oakley2016-10-21
* | | | | Merge branch 'jk/tap-verbose-fix'Junio C Hamano2016-10-26
|\ \ \ \ \
| * | | | | test-lib: bail out when "-v" used under "prove"Jeff King2016-10-24
| * | | | | travis: use --verbose-log test optionJeff King2016-10-21
| * | | | | test-lib: add --verbose-log optionJeff King2016-10-21
| * | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King2016-10-21
| |/ / / /
* | | | | Merge branch 'mm/send-email-cc-cruft-after-address'Junio C Hamano2016-10-26
|\ \ \ \ \
| * | | | | Git.pm: add comment pointing to t9000Matthieu Moy2016-10-21
| * | | | | t9000-addresses: update expected results after fixMatthieu Moy2016-10-21
| * | | | | parse_mailboxes: accept extra text after <...> addressMatthieu Moy2016-10-14
* | | | | | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'Junio C Hamano2016-10-26
|\ \ \ \ \ \
| * | | | | | doc: remove reference to the traditional layout in git-tag.txtYounes Khoudli2016-10-20
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'pt/gitgui-updates'Junio C Hamano2016-10-26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guiJunio C Hamano2016-10-20
| |\ \ \ \ \ \
| | * | | | | | git-gui: set version 0.21Pat Thoyts2016-10-20
| | * | | | | | Merge branch 'as/bulgarian' into puPat Thoyts2016-10-20
| | |\ \ \ \ \ \
| | | * | | | | | git-gui: Mark 'All' in remote.tcl for translationAlexander Shopov2016-10-20
| | | * | | | | | git-gui i18n: Updated Bulgarian translation (565,0f,0u)Alexander Shopov2016-10-20
| | * | | | | | | Merge branch 'os/preserve-author' into puPat Thoyts2016-10-20
| | |\ \ \ \ \ \ \
| | | * | | | | | | git-gui: avoid persisting modified author identityPat Thoyts2016-10-06
| | | * | | | | | | git-gui: Do not reset author details on amendOrgad Shaneh2016-04-14
| | * | | | | | | | Merge branch 'kb/unicode' into puPat Thoyts2016-10-20
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | git-gui: handle the encoding of Git's output correctlyKarsten Blees2016-10-06